修改话费订单

hai-bweb/src/main/java/com/bweb/controller/OutRechargeOrderController.java

@@ -131,6 +131,7 @@ public class OutRechargeOrderController {
             @RequestParam(name = "rechargeModel", required = false) String rechargeModel,
             @RequestParam(name = "rechargeContent", required = false) String rechargeContent,
             @RequestParam(name = "userPhone", required = false) String userPhone,
+            @RequestParam(name = "idCard", required = false) String idCard,
             @RequestParam(name = "payType", required = false) Integer payType,
             @RequestParam(name = "code", required = false) Integer code,
             @RequestParam(name = "payTimeS", required = false) Long payTimeS,
@@ -159,6 +160,9 @@ public class OutRechargeOrderController {
             if (StringUtils.isNotBlank(userPhone)) {
                 map.put("userPhone", userPhone);
             }
+            if (StringUtils.isNotBlank(idCard)) {
+                map.put("idCard", idCard);
+            }
             if (payType != null) {
                 map.put("payType" , payType.toString());
             }
@@ -203,6 +207,7 @@ public class OutRechargeOrderController {
                                         @RequestParam(name = "rechargeModel", required = false) String rechargeModel,
                                         @RequestParam(name = "rechargeContent", required = false) String rechargeContent,
                                         @RequestParam(name = "userPhone", required = false) String userPhone,
+                                        @RequestParam(name = "idCard", required = false) String idCard,
                                         @RequestParam(name = "payType", required = false) Integer payType,
                                         @RequestParam(name = "code", required = false) Integer code,
                                         @RequestParam(name = "createTimeS", required = false) Long createTimeS,
@@ -217,6 +222,7 @@ public class OutRechargeOrderController {
             map.put("rechargeModel", rechargeModel);
             map.put("rechargeContent", rechargeContent);
             map.put("userPhone", userPhone);
+            map.put("idCard", idCard);
             map.put("payType", payType);
             map.put("code", code);
             map.put("createTimeS", createTimeS);

hai-cweb/src/main/java/com/cweb/controller/OutRechargeOrderController.java

@@ -79,17 +79,14 @@ public class OutRechargeOrderController {
     @Resource
     private HighProfitSharingRecordService highProfitSharingRecordService;
 
-    @Resource
-    private CommonService commonService;
-
     @Resource
     private SecConfigService secConfigService;
 
     @Resource
-    private HighUserPayPasswordService highUserPayPasswordService;
+    private HighUserCardService highUserCardService;
 
     @Resource
-    private HighUserCardService highUserCardService;
+    private HighUserPayPasswordService highUserPayPasswordService;
 
     @Resource
     private UnionPayConfig unionPayConfig;
@@ -131,9 +128,14 @@ public class OutRechargeOrderController {
                 log.error("orderToPay error!");
                 throw ErrorHelp.genException(SysCode.System, ErrorCode.PHONE_NUM_IS_ERROR);
             }
+
+            HighUserCard highUserCard = highUserCardService.getUserHtlCardNo(userInfoModel.getHighUser().getId());
+
             outRechargeOrder.setRemarks(remarks);
+            outRechargeOrder.setRechargeName(remarks);
             outRechargeOrder.setOrderNo("CZ" + DateUtil.date2String(new Date(),"yyyyMMddHHmmss") + IDGenerator.nextId(5));
             outRechargeOrder.setUserId(userInfoModel.getHighUser().getId());
+            outRechargeOrder.setIdCard(highUserCard.getCardNo());
             outRechargeOrder.setUserName(userInfoModel.getHighUser().getName());
             outRechargeOrder.setUserPhone(userInfoModel.getHighUser().getPhone());
 

hai-service/src/main/java/com/hai/dao/OutRechargeOrderMapperExt.java

@@ -66,9 +66,9 @@ public interface OutRechargeOrderMapperExt {
                    " a.user_phone userPhone," +
                    " case a.recharge_model when 1 then '电信话费' when 2 then '移动话费' when 3 then '联通话费' end rechargeModelName," +
                    " a.recharge_content rechargeContent," +
-                   " a.recharge_name rechargeName," +
-                   " a.id_card rechargeIdCard," +
                    " a.remarks remarks," +
+                   " a.id_card cardNo," +
+                   " a.recharge_name rechargeName," +
                    " case a.pay_type when 1 then '微信' when 2 then '工会卡' when 3 then '积分' when 4 then '银联' end payTypeName," +
                    " a.order_price orderPrice," +
                    " a.pay_price payPrice," +
@@ -81,22 +81,21 @@ public interface OutRechargeOrderMapperExt {
                    " a.refund_time refundTime," +
                    " a.refund_fee refundFee," +
                    " a.out_refund_no outRefundNo," +
-                   " a.refund_id refundId," +
+                   " a.refund_id refundId" +
-                   " b.card_no cardNo" +
                    " FROM" +
-                   " out_recharge_order a join high_user_card b on a.user_id = b.user_id where 1 = 1 " +
+                   " out_recharge_order a  where 1 = 1 " +
                    "<if test='map.status != null'> and a.`status` = #{map.status} </if>",
                    "<if test='map.payType != null'> and a.`pay_type` = #{map.payType} </if>",
                    "<if test='map.code != null'> and a.`Identification_code` = #{map.code} </if>",
                    "<if test='map.orderNo != null'> and a.`order_no` = #{map.orderNo} </if>",
                    "<if test='map.rechargeModel != null'> and a.`recharge_model` = #{map.rechargeModel} </if>",
                    "<if test='map.rechargeContent != null'> and a.`recharge_content` LIKE '%${map.rechargeContent}%'  </if>",
+                   "<if test='map.idCard != null'> and a.`id_card` LIKE '%${map.idCard}%'  </if>",
                    "<if test='map.userPhone != null'> and a.`user_phone` = #{map.userPhone} </if>",
                    "<if test='map.createTimeS != null'> <![CDATA[ and a.create_timed >= #{map.createTimeS} ]]> </if>",
                    "<if test='map.createTimeE != null'> <![CDATA[ and a.create_timed <= #{map.createTimeE} ]]> </if>",
                    "<if test='map.payTimeS != null'> <![CDATA[ and a.pay_time >= #{map.payTimeS} ]]> </if>",
                    "<if test='map.payTimeE != null'> <![CDATA[ and a.pay_time <= #{map.payTimeE} ]]> </if>",
-                   " group by pay_time " +
                    " ORDER BY" +
                    " a.create_timed DESC " +
                 "</script>"

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

@@ -73,6 +73,10 @@ public class OutRechargeOrderServiceImpl implements OutRechargeOrderService {
             criteria.andOrderNoLike("%" + MapUtils.getString(map, "orderNo") + "%");
         }
 
+        if (MapUtils.getString(map, "idCard") != null) {
+            criteria.andIdCardLike("%" + MapUtils.getString(map, "idCard") + "%");
+        }
+
         if (MapUtils.getString(map, "userPhone") != null) {
             criteria.andUserPhoneEqualTo(MapUtils.getString(map, "userPhone"));
         }