Merge remote-tracking branch 'origin/2.0-dev' into 2.0-dev

hai-order/src/main/java/com/web/controller/business/OrderOilController.java

@@ -9,6 +9,7 @@ import com.hai.common.exception.SysCode;
 import com.hai.common.security.UserCenter;
 import com.hai.common.utils.ResponseMsgUtil;
 import com.hai.entity.HighGasOrder;
+import com.hai.enum_type.MerchantStoreSourceType;
 import com.hai.enum_type.UserObjectTypeEnum;
 import com.hai.enum_type.UserRoleTypeEnum;
 import com.hai.model.ResponseData;
@@ -17,6 +18,7 @@ import com.hai.order.model.ExportGasOrderModel;
 import com.hai.order.service.OrderService;
 import com.hai.order.service.OrderServiceExt;
 import com.hai.order.type.OrderOilStatus;
+import com.hai.order.type.OrderPayType;
 import com.hai.service.HighGasOrderService;
 import com.web.config.SysConst;
 import io.swagger.annotations.Api;
@@ -90,6 +92,25 @@ public class OrderOilController {
                 throw ErrorHelp.genException(SysCode.System, ErrorCode.SEC_USER_EXPIRED, "");
             }
             Map<String, Object> param = new HashMap<>();
+            param.put("gasOrgId", gasOrgId);
+            param.put("gasAgentId", gasAgentId);
+            param.put("gasSalesmanId", gasAgentId);
+            param.put("memCardType", memCardType);
+            param.put("memCardNo", memCardNo);
+            param.put("memPhone", memPhone);
+            param.put("gasOilNo", gasOilNo);
+            param.put("gasCarLicensePlate", gasCarLicensePlate);
+            param.put("orderNo", orderNo);
+            param.put("childOrderNo", childOrderNo);
+            param.put("payType", payType);
+            param.put("status", status);
+            param.put("createTimeS", createTimeS);
+            param.put("createTimeE", createTimeE);
+            param.put("payTimeS", payTimeS);
+            param.put("payTimeE", payTimeE);
+            param.put("refundTimeS", refundTimeS);
+            param.put("refundTimeE", refundTimeE);
+
             if (userInfoModel.getSecUser().getObjectType().equals(UserObjectTypeEnum.type0.getType())) {
                 param.put("companyId", companyId);
                 param.put("merId", merId);
@@ -100,6 +121,9 @@ public class OrderOilController {
                 param.put("gasStaffName", gasStaffName);
 
             } else if (userInfoModel.getSecUser().getObjectType().equals(UserObjectTypeEnum.type1.getType())) {
+                if (userInfoModel.getSecUser().getAdminFlag().equals(0)) {
+                    param.put("gasOrgId", userInfoModel.getBsOrganization().getId());
+                }
                 param.put("companyId", userInfoModel.getBsCompany().getId());
                 param.put("merId", merId);
                 param.put("storeId", storeId);
@@ -139,24 +163,6 @@ public class OrderOilController {
                 throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未知用户身份");
             }
 
-            param.put("gasOrgId", gasOrgId);
-            param.put("gasAgentId", gasAgentId);
-            param.put("gasSalesmanId", gasAgentId);
-            param.put("memCardType", memCardType);
-            param.put("memCardNo", memCardNo);
-            param.put("memPhone", memPhone);
-            param.put("gasOilNo", gasOilNo);
-            param.put("gasCarLicensePlate", gasCarLicensePlate);
-            param.put("orderNo", orderNo);
-            param.put("childOrderNo", childOrderNo);
-            param.put("payType", payType);
-            param.put("status", status);
-            param.put("createTimeS", createTimeS);
-            param.put("createTimeE", createTimeE);
-            param.put("payTimeS", payTimeS);
-            param.put("payTimeE", payTimeE);
-            param.put("refundTimeS", refundTimeS);
-            param.put("refundTimeE", refundTimeE);
 
             PageHelper.startPage(pageNum, pageSize);
             return ResponseMsgUtil.success(new PageInfo<>(gasOrderService.getGasOrderList(param)));
@@ -203,25 +209,29 @@ public class OrderOilController {
     @ResponseBody
     @ApiOperation(value = "导出加油订单")
     public ResponseData exportOilOrder(@RequestParam(name = "companyId", required = false) Long companyId,
-                                        @RequestParam(name = "merId", required = false) Long merId,
+                                       @RequestParam(name = "merId", required = false) Long merId,
-                                        @RequestParam(name = "storeId", required = false) Long storeId,
+                                       @RequestParam(name = "storeId", required = false) Long storeId,
-                                        @RequestParam(name = "storeName", required = false) String storeName,
+                                       @RequestParam(name = "storeName", required = false) String storeName,
-                                        @RequestParam(name = "orderNo", required = false) String orderNo,
+                                       @RequestParam(name = "orderNo", required = false) String orderNo,
-                                        @RequestParam(name = "childOrderNo", required = false) String childOrderNo,
+                                       @RequestParam(name = "childOrderNo", required = false) String childOrderNo,
-                                        @RequestParam(name = "memPhone", required = false) String memPhone,
+                                       @RequestParam(name = "memPhone", required = false) String memPhone,
-                                        @RequestParam(name = "gasOilType", required = false) Integer gasOilType,
+                                       @RequestParam(name = "memCardType", required = false) Integer memCardType,
-                                        @RequestParam(name = "status", required = false) Integer status,
+                                       @RequestParam(name = "memCardNo", required = false) String memCardNo,
-                                        @RequestParam(name = "gasOrgId", required = false) Long gasOrgId,
+                                       @RequestParam(name = "gasOilType", required = false) Integer gasOilType,
-                                        @RequestParam(name = "gasAgentId", required = false) Long gasAgentId,
+                                       @RequestParam(name = "payType", required = false) Integer payType,
-                                        @RequestParam(name = "gasSalesmanId", required = false) Long gasSalesmanId,
+                                       @RequestParam(name = "status", required = false) Integer status,
-                                        @RequestParam(name = "gasStaffName", required = false) String gasStaffName,
+                                       @RequestParam(name = "gasOrgId", required = false) Long gasOrgId,
-                                        @RequestParam(name = "gasOilNo", required = false) String gasOilNo,
+                                       @RequestParam(name = "gasAgentId", required = false) Long gasAgentId,
-                                        @RequestParam(name = "createTimeS", required = false) Long createTimeS,
+                                       @RequestParam(name = "gasSalesmanId", required = false) Long gasSalesmanId,
-                                        @RequestParam(name = "createTimeE", required = false) Long createTimeE,
+                                       @RequestParam(name = "gasStaffName", required = false) String gasStaffName,
-                                        @RequestParam(name = "payTimeS", required = false) Long payTimeS,
+                                       @RequestParam(name = "gasOilNo", required = false) String gasOilNo,
-                                        @RequestParam(name = "payTimeE", required = false) Long payTimeE,
+                                       @RequestParam(name = "gasCarLicensePlate", required = false) String gasCarLicensePlate,
-                                        @RequestParam(name = "refundTimeS", required = false) Long refundTimeS,
+                                       @RequestParam(name = "createTimeS", required = false) Long createTimeS,
-                                        @RequestParam(name = "refundTimeE", required = false) Long refundTimeE
+                                       @RequestParam(name = "createTimeE", required = false) Long createTimeE,
+                                       @RequestParam(name = "payTimeS", required = false) Long payTimeS,
+                                       @RequestParam(name = "payTimeE", required = false) Long payTimeE,
+                                       @RequestParam(name = "refundTimeS", required = false) Long refundTimeS,
+                                       @RequestParam(name = "refundTimeE", required = false) Long refundTimeE
     ) {
         try {
             UserInfoModel userInfoModel = userCenter.getSessionModel(UserInfoModel.class);
@@ -230,6 +240,25 @@ public class OrderOilController {
                 throw ErrorHelp.genException(SysCode.System, ErrorCode.SEC_USER_EXPIRED, "");
             }
             Map<String, Object> param = new HashMap<>();
+            param.put("gasOrgId", gasOrgId);
+            param.put("gasAgentId", gasAgentId);
+            param.put("gasSalesmanId", gasAgentId);
+            param.put("memCardType", memCardType);
+            param.put("memCardNo", memCardNo);
+            param.put("memPhone", memPhone);
+            param.put("gasOilNo", gasOilNo);
+            param.put("gasCarLicensePlate", gasCarLicensePlate);
+            param.put("orderNo", orderNo);
+            param.put("childOrderNo", childOrderNo);
+            param.put("payType", payType);
+            param.put("status", status);
+            param.put("createTimeS", createTimeS);
+            param.put("createTimeE", createTimeE);
+            param.put("payTimeS", payTimeS);
+            param.put("payTimeE", payTimeE);
+            param.put("refundTimeS", refundTimeS);
+            param.put("refundTimeE", refundTimeE);
+
             if (userInfoModel.getSecUser().getObjectType().equals(UserObjectTypeEnum.type0.getType())) {
                 param.put("companyId", companyId);
                 param.put("merId", merId);
@@ -240,6 +269,9 @@ public class OrderOilController {
                 param.put("gasStaffName", gasStaffName);
 
             } else if (userInfoModel.getSecUser().getObjectType().equals(UserObjectTypeEnum.type1.getType())) {
+                if (userInfoModel.getSecUser().getAdminFlag().equals(0)) {
+                    param.put("gasOrgId", userInfoModel.getBsOrganization().getId());
+                }
                 param.put("companyId", userInfoModel.getBsCompany().getId());
                 param.put("merId", merId);
                 param.put("storeId", storeId);
@@ -279,21 +311,6 @@ public class OrderOilController {
                 throw ErrorHelp.genException(SysCode.System, ErrorCode.COMMON_ERROR, "未知用户身份");
             }
 
-            param.put("gasOrgId", gasOrgId);
-            param.put("gasAgentId", gasAgentId);
-            param.put("gasSalesmanId", gasAgentId);
-            param.put("memPhone", memPhone);
-            param.put("gasOilNo", gasOilNo);
-            param.put("orderNo", orderNo);
-            param.put("childOrderNo", childOrderNo);
-            param.put("status", status);
-            param.put("createTimeS", createTimeS);
-            param.put("createTimeE", createTimeE);
-            param.put("payTimeS", payTimeS);
-            param.put("payTimeE", payTimeE);
-            param.put("refundTimeS", refundTimeS);
-            param.put("refundTimeE", refundTimeE);
-
             // 查询数据
             List<HighGasOrder> orderList = gasOrderService.getGasOrderList(param);
 
@@ -305,6 +322,7 @@ public class OrderOilController {
                 model.setOrderNo(gasOrder.getOrderNo());
                 model.setStoreName(gasOrder.getStoreName());
                 model.setGasStaffName(gasOrder.getGasStaffName());
+                model.setGasCarLicensePlate(gasOrder.getGasCarLicensePlate());
                 model.setMemPhone(gasOrder.getMemPhone());
                 model.setGasRefuelPrice(gasOrder.getGasRefuelPrice());
                 model.setGasOilLiters(gasOrder.getGasOilLiters());
@@ -315,6 +333,7 @@ public class OrderOilController {
                 model.setGasPricePlatform(gasOrder.getGasPricePlatform());
                 model.setGasPriceGun(gasOrder.getGasPriceGun());
                 model.setGasPriceOfficial(gasOrder.getGasPriceOfficial());
+                model.setPayTypeName(gasOrder.getPayType()!=null?OrderPayType.getDataByType(gasOrder.getPayType()).getName():"未支付");
                 model.setTotalDeductionPrice(gasOrder.getTotalDeductionPrice());
                 model.setDeductionCouponPrice(gasOrder.getDeductionCouponPrice());
                 model.setDeductionProductPrice(gasOrder.getDeductionProductPrice());
@@ -331,6 +350,7 @@ public class OrderOilController {
                 model.setGasSalesmanName(gasOrder.getGasSalesmanName());
                 model.setGasAgentName(gasOrder.getGasAgentName());
                 model.setGasOrgName(gasOrder.getGasOrgName());
+                model.setChannelTypeName(MerchantStoreSourceType.getNameByType(gasOrder.getChannelType()));
                 dataList.add(model);
             }
 
@@ -344,6 +364,7 @@ public class OrderOilController {
             Set<String> includeColumnFiledNames = new HashSet<String>();
             includeColumnFiledNames.add("orderNo");
             includeColumnFiledNames.add("memPhone");
+            includeColumnFiledNames.add("gasCarLicensePlate");
             includeColumnFiledNames.add("gasRefuelPrice");
             includeColumnFiledNames.add("gasOilLiters");
             includeColumnFiledNames.add("gasDiscount");
@@ -353,6 +374,7 @@ public class OrderOilController {
             includeColumnFiledNames.add("gasPricePlatform");
             includeColumnFiledNames.add("gasPriceGun");
             includeColumnFiledNames.add("gasPriceOfficial");
+            includeColumnFiledNames.add("payTypeName");
             includeColumnFiledNames.add("totalDeductionPrice");
             includeColumnFiledNames.add("deductionCouponPrice");
             includeColumnFiledNames.add("deductionProductPrice");
@@ -364,6 +386,7 @@ public class OrderOilController {
             includeColumnFiledNames.add("payTime");
             includeColumnFiledNames.add("refundTime");
             includeColumnFiledNames.add("cancelTime");
+            includeColumnFiledNames.add("channelTypeName");
 
             if (!userInfoModel.getSecRole().getRoleType().equals(UserRoleTypeEnum.type3.getType())
                 && !userInfoModel.getSecRole().getRoleType().equals(UserRoleTypeEnum.type10.getType())) {

hai-order/src/main/resources/dev/logback.xml

@@ -61,7 +61,7 @@
               class="ch.qos.logback.core.rolling.RollingFileAppender">
         <File>log/HltCardLog.log</File>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>log/HltCardLog.log.%d.%i</fileNamePattern>
+            <fileNamePattern>log/hlt/hltcard.log.%d.%i</fileNamePattern>
             <timeBasedFileNamingAndTriggeringPolicy  class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
                 <!-- or whenever the file size reaches 64 MB -->
                 <maxFileSize>64 MB</maxFileSize>
@@ -78,7 +78,7 @@
               class="ch.qos.logback.core.rolling.RollingFileAppender">
         <File>log/PayNotify.log</File>
         <rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
-            <fileNamePattern>log/PayNotify/PayNotify.log.%d.%i</fileNamePattern>
+            <fileNamePattern>log/paynotify/paynotify.log.%d.%i</fileNamePattern>
             <timeBasedFileNamingAndTriggeringPolicy  class="ch.qos.logback.core.rolling.SizeAndTimeBasedFNATP">
                 <!-- or whenever the file size reaches 64 MB -->
                 <maxFileSize>64 MB</maxFileSize>

hai-service/src/main/java/com/hai/config/HuiLianTongUnionCardConfig.java

@@ -326,7 +326,7 @@ public class HuiLianTongUnionCardConfig {
 
     public static void main(String[] args) {
         // {"respMessage":"ok","data":"Gbkl57c3fEBg+E3HfPuQ580JLkHaQPyf1P7My1oYOyJSIG4i8jYxovGVk4V8Rk58mjDswB8Vpy4E\nyj/wi/UNr8TDne094+yu","sign":"47186141FD8B3FB6CCB590F58321D9C6","respCode":"0000","responseId":"1669202185936"}
-        String data = "Gbkl57c3fEBg+E3HfPuQ580JLkHaQPyf1P7My1oYOyJSIG4i8jYxovGVk4V8Rk58mjDswB8Vpy4E\\nyj/wi/UNr8TDne094+yu".replace("\\n", "");
+        String data = "Gbkl57c3fEBg+E3HfPuQ580JLkHaQPyf1P7My1oYOyJSIG4i8jYxovGVk4V8Rk58mjDswB8Vpy4E\nyj/wi/UNr8TDne094+yu".replace("\\n", "");
         String decodeData = DesUtil.decode("F8E91A3C", data, Charset.forName("UTF-8"));
         System.out.println(JSONObject.parseObject(decodeData));
 

hai-service/src/main/java/com/hai/enum_type/MerchantStoreSourceType.java

@@ -1,24 +1,36 @@
 package com.hai.enum_type;
 
+import java.util.Objects;
+
 /**
  * 门店来源
  * @author hurui
  */
 public enum MerchantStoreSourceType {
-    type1(1, "平台自建"),
+    type1(1, "平台自建", "自建站"),
-    type2(2, "团油门店"),
+    type2(2, "团油门店", "团油"),
-    type3(3, "加好油"),
+    type3(3, "加好油", "重庆壳牌"),
-    type4(4, "金猪加油"),
+    type4(4, "金猪加油", "金猪加油"),
-    type5(5, "paylo"),
+    type5(5, "paylo", "四川壳牌"),
     ;
 
     private Integer number;
 
     private String name;
 
-    MerchantStoreSourceType(int number, String name) {
+    private String desc;
+
+    MerchantStoreSourceType(int number, String name, String desc) {
         this.number = number;
         this.name = name;
+        this.desc = desc;
+    }
+
+    public static String getNameByType(Integer type) {
+        for (MerchantStoreSourceType ele : values()) {
+            if(Objects.equals(type,ele.getNumber())) return ele.getName();
+        }
+        return null;
     }
 
     public Integer getNumber() {
@@ -36,4 +48,12 @@ public enum MerchantStoreSourceType {
     public void setName(String name) {
         this.name = name;
     }
+
+    public String getDesc() {
+        return desc;
+    }
+
+    public void setDesc(String desc) {
+        this.desc = desc;
+    }
 }

hai-service/src/main/java/com/hai/order/model/ExportGasOrderModel.java

@@ -32,6 +32,10 @@ public class ExportGasOrderModel {
     @ExcelProperty("加油员")
     private String gasStaffName;
 
+    @ColumnWidth(15)
+    @ExcelProperty("车牌")
+    private String gasCarLicensePlate;
+
     @ColumnWidth(15)
     @ExcelProperty({ "加油信息", "加油金额"})
     private BigDecimal gasRefuelPrice;
@@ -68,6 +72,10 @@ public class ExportGasOrderModel {
     @ExcelProperty({ "加油信息", "国标价"})
     private BigDecimal gasPriceOfficial;
 
+    @ColumnWidth(15)
+    @ExcelProperty({ "支付信息", "支付方式"})
+    private String payTypeName;
+
     @ColumnWidth(15)
     @ExcelProperty({ "支付信息", "总优惠"})
     private BigDecimal totalDeductionPrice;
@@ -112,6 +120,10 @@ public class ExportGasOrderModel {
     @ExcelProperty("取消时间")
     private Date cancelTime;
 
+    @ColumnWidth(22)
+    @ExcelProperty("油站渠道")
+    private String channelTypeName;
+
     @ColumnWidth(20)
     @ExcelProperty("分公司")
     private String companyName;

hai-service/src/main/java/com/hai/order/type/OrderPayType.java

@@ -55,4 +55,5 @@ public enum OrderPayType {
     public void setName(String name) {
         this.name = name;
     }
+
 }

hai-service/src/main/java/com/hai/service/impl/HighGasOrderServiceImpl.java

@@ -102,6 +102,10 @@ public class HighGasOrderServiceImpl implements HighGasOrderService {
             criteria.andChildOrderNoLike("%"+MapUtils.getString(param, "childOrderNo")+"%");
         }
 
+        if (StringUtils.isNotBlank(MapUtils.getString(param, "memCardNo"))) {
+            criteria.andMemCardNoLike("%"+MapUtils.getString(param, "memCardNo")+"%");
+        }
+
         if (StringUtils.isNotBlank(MapUtils.getString(param, "memPhone"))) {
             criteria.andMemPhoneLike("%"+MapUtils.getString(param, "memPhone")+"%");
         }