提交代码

bweb/src/main/java/com/bweb/controller/BsGasOrderController.java

@@ -64,6 +64,7 @@ public class BsGasOrderController {
                                           @RequestParam(name = "paySerialNo", required = false) String paySerialNo,
                                           @RequestParam(name = "channelType", required = false) Integer channelType,
                                           @RequestParam(name = "channelOrderNo", required = false) String channelOrderNo,
+                                          @RequestParam(name = "abnormal", required = false) String abnormal,
                                           @RequestParam(name = "status", required = false) Integer status,
                                           @RequestParam(name = "createTimeS", required = false) Long createTimeS,
                                           @RequestParam(name = "createTimeE", required = false) Long createTimeE,
@@ -96,6 +97,7 @@ public class BsGasOrderController {
             param.put("gasClassGroupTaskId", gasClassGroupTaskId);
             param.put("gasStaffName", gasStaffName);
             param.put("gasOilNo", gasOilNo);
+            param.put("abnormal", abnormal);
 
             if (sessionObject.getAccount().getObjectType().equals(SecUserObjectTypeEnum.type1.getCode())) {
                 param.put("merId", merId);
@@ -137,6 +139,7 @@ public class BsGasOrderController {
                                           @RequestParam(name = "channelType", required = false) Integer channelType,
                                           @RequestParam(name = "channelOrderNo", required = false) String channelOrderNo,
                                           @RequestParam(name = "status", required = false) Integer status,
+                                          @RequestParam(name = "abnormal", required = false) Integer abnormal,
                                           @RequestParam(name = "createTimeS", required = false) Long createTimeS,
                                           @RequestParam(name = "createTimeE", required = false) Long createTimeE,
                                           @RequestParam(name = "payTimeS", required = false) Long payTimeS,
@@ -170,6 +173,7 @@ public class BsGasOrderController {
             param.put("gasClassGroupTaskId", gasClassGroupTaskId);
             param.put("gasStaffName", gasStaffName);
             param.put("gasOilNo", gasOilNo);
+            param.put("abnormal", abnormal);
 
             if (sessionObject.getAccount().getObjectType().equals(SecUserObjectTypeEnum.type1.getCode())) {
                 param.put("merId", merId);
@@ -213,6 +217,7 @@ public class BsGasOrderController {
                                           @RequestParam(name = "channelType", required = false) Integer channelType,
                                           @RequestParam(name = "channelOrderNo", required = false) String channelOrderNo,
                                           @RequestParam(name = "status", required = false) Integer status,
+                                          @RequestParam(name = "abnormal", required = false) Integer abnormal,
                                           @RequestParam(name = "createTimeS", required = false) Long createTimeS,
                                           @RequestParam(name = "createTimeE", required = false) Long createTimeE,
                                           @RequestParam(name = "payTimeS", required = false) Long payTimeS,
@@ -244,6 +249,7 @@ public class BsGasOrderController {
             param.put("gasClassGroupTaskId", gasClassGroupTaskId);
             param.put("gasStaffName", gasStaffName);
             param.put("gasOilNo", gasOilNo);
+            param.put("abnormal", abnormal);
 
             if (sessionObject.getAccount().getObjectType().equals(SecUserObjectTypeEnum.type1.getCode())) {
                 param.put("merId", merId);

bweb/src/main/java/com/bweb/controller/BsMerchantController.java

@@ -231,12 +231,14 @@ public class BsMerchantController {
     @RequestMapping(value = "/queryMerList", method = RequestMethod.GET)
     @ResponseBody
     @ApiOperation(value = "查询商户列表")
-    public ResponseData queryMerList(@RequestParam(value = "merNo", required = false) String merNo,
+    public ResponseData queryMerList(@RequestParam(value = "sourceType", required = false) Integer sourceType,
+                                     @RequestParam(value = "merNo", required = false) String merNo,
                                      @RequestParam(value = "merName", required = false) String merName,
                                      @RequestParam(value = "pageNum", required = true) Integer pageNum,
                                      @RequestParam(value = "pageSize", required = true) Integer pageSize) {
         try {
             Map<String,Object> map = new HashMap<>();
+            map.put("sourceType", sourceType);
             map.put("merNo", merNo);
             map.put("merName", merName);
 

service/src/main/java/com/hfkj/dao/BsGasOrderMapperExt.java

@@ -35,6 +35,7 @@ public interface BsGasOrderMapperExt {
             " <if test='param.agentId != null'> and agent_id = #{param.agentId} </if>" +
             " <if test='param.agentStaffId != null'> and agent_staff_id = #{param.agentStaffId} </if>" +
             " <if test='param.status != null'> and status = #{param.status} </if>" +
+            " <if test='param.abnormal != null'> and abnormal = #{param.abnormal} </if>" +
             " <if test='param.gasClassGroupId != null'> and gas_class_group_id = #{param.gasClassGroupId} </if>" +
             " <if test='param.gasClassGroupTaskId != null'> and gas_class_group_task_id = #{param.gasClassGroupTaskId} </if>" +
             " <if test='param.gasOilNo != null'> and gas_oil_no = #{param.gasOilNo} </if>" +

service/src/main/java/com/hfkj/service/gas/impl/BsGasOrderServiceImpl.java

@@ -241,6 +241,10 @@ public class BsGasOrderServiceImpl implements BsGasOrderService {
             criteria.andRefundTimeLessThanOrEqualTo(new Date(MapUtils.getLong(param, "refundTimeE")));
         }
 
+        if (MapUtils.getBoolean(param, "abnormal") != null) {
+            criteria.andAbnormalEqualTo(MapUtils.getBoolean(param,"abnormal"));
+        }
+
         example.setOrderByClause("create_time desc");
         return gasOrderMapper.selectByExample(example);
     }

service/src/main/java/com/hfkj/service/merchant/impl/BsMerchantServiceImpl.java

@@ -169,6 +169,10 @@ public class BsMerchantServiceImpl implements BsMerchantService {
         BsMerchantExample example = new BsMerchantExample();
         BsMerchantExample.Criteria criteria = example.createCriteria().andStatusNotEqualTo(MerchantStatusEnum.status0.getNumber());
 
+        if (MapUtils.getInteger(param, "sourceType") != null) {
+            criteria.andSourceTypeEqualTo(MapUtils.getInteger(param, "sourceType"));
+        }
+
         if (StringUtils.isNotBlank(MapUtils.getString(param, "merNo"))) {
             criteria.andMerNoLike("%"+MapUtils.getString(param, "merNo")+"%");
         }