添加卡增加cvn2等字段，修改查询订单等bug

src/main/java/com/thinkgem/jeesite/modules/pay/service/OrderService.java

@@ -33,10 +33,10 @@ public class OrderService {
      */
     public List<OrderEntity> getOrderList(OrderRequest request){
         if(request.getStartDate()!= null && request.getStartDate() != 0){
-            request.setStartTime(DateUtils.formatDate(new Date(request.getStartDate()*1000),"yyyy-MM-dd") + " 00:00:00");
+            request.setStartTime(DateUtils.formatDate(new Date(request.getStartDate()),"yyyy-MM-dd") + " 00:00:00");
         }
         if(request.getEndDate() != null && request.getEndDate() != 0){
-            request.setEndTime(DateUtils.formatDate(new Date(request.getEndDate()*1000),"yyyy-MM-dd") + " 23:59:59");
+            request.setEndTime(DateUtils.formatDate(new Date(request.getEndDate()),"yyyy-MM-dd") + " 23:59:59");
         }
 
         return orderApiDao.getOrderList(request);
@@ -57,10 +57,10 @@ public class OrderService {
         page.setPageSize(request.getPageSize());
         request.setPage(page);
         if(request.getStartDate()!= null && request.getStartDate() != 0){
-            request.setStartTime(DateUtils.formatDate(new Date(request.getStartDate()*1000),"yyyy-MM-dd") + " 00:00:00");
+            request.setStartTime(DateUtils.formatDate(new Date(request.getStartDate()),"yyyy-MM-dd") + " 00:00:00");
         }
         if(request.getEndDate() != null && request.getEndDate() != 0){
-            request.setEndTime(DateUtils.formatDate(new Date(request.getEndDate()*1000),"yyyy-MM-dd") + " 23:59:59");
+            request.setEndTime(DateUtils.formatDate(new Date(request.getEndDate()),"yyyy-MM-dd") + " 23:59:59");
         }
         List<OrderEntity> list = orderApiDao.getOrderList(request);
         page.setList(list);

src/main/java/com/thinkgem/jeesite/modules/user/api/UserApiController.java

@@ -341,6 +341,11 @@ public class UserApiController {
             if(!regex.matcher(request.getCardMobile()).matches()){
                 throw new MyException("手机号码格式不正确");
             }
+            if(request.getCardType().equals("C")){
+                if (StringUtils.isBlank(request.getCvn2())|| StringUtils.isBlank(request.getExpireDate())){
+                    throw new MyException("信用卡信息需补全");
+                }
+            }
             // 根据手机号 + 使用场景 + 验证码查询
             request.setMobile(request.getCardMobile());
 //            IdentityCodeEntity identityCodeEntity = userService.getIdentifyCode(request);

src/main/java/com/thinkgem/jeesite/modules/user/bean/UserRequest.java

@@ -42,6 +42,10 @@ public class UserRequest extends Request {
 
     private String cardCode;
 
+    private String expireDate;//信用卡到期时间
+
+    private String cvn2;//信用卡校验码
+
 
 
     public String getMobile() {
@@ -299,4 +303,20 @@ public class UserRequest extends Request {
     public void setCardCode(String cardCode) {
         this.cardCode = cardCode;
     }
+
+    public String getExpireDate() {
+        return expireDate;
+    }
+
+    public void setExpireDate(String expireDate) {
+        this.expireDate = expireDate;
+    }
+
+    public String getCvn2() {
+        return cvn2;
+    }
+
+    public void setCvn2(String cvn2) {
+        this.cvn2 = cvn2;
+    }
 }

src/main/java/com/thinkgem/jeesite/modules/user/entity/CardEntity.java

@@ -41,6 +41,10 @@ public class CardEntity extends BaseEntity implements Serializable {
 
     private String isOpenCard = "1";
 
+    private String expireDate;//信用卡到期时间
+
+    private String cvn2;//信用卡校验码
+
     public CardEntity() {
     }
 
@@ -53,11 +57,13 @@ public class CardEntity extends BaseEntity implements Serializable {
         this.isDebit = isDebit;
     }
 
-    public CardEntity(String code, String userCode, String cardType, String cardNo, String cardMobile, String belongBank, String cardBank, String cardPlace, String isDebit, String subMerchantId, String cardSrc, String type, String status, String province, String city) {
+    public CardEntity(String code, String userCode, String cardType, String cardNo, String expireDate, String cvn2, String cardMobile, String belongBank, String cardBank, String cardPlace, String isDebit, String subMerchantId, String cardSrc, String type, String status, String province, String city) {
         this.setCode(code);
         this.userCode = userCode;
         this.cardType = cardType;
         this.cardNo = cardNo;
+        this.expireDate = expireDate;
+        this.cvn2 = cvn2;
         this.cardMobile = cardMobile;
         this.belongBank = belongBank;
         this.cardBank = cardBank;
@@ -241,4 +247,21 @@ public class CardEntity extends BaseEntity implements Serializable {
     public void setIsOpenCard(String isOpenCard) {
         this.isOpenCard = isOpenCard;
     }
+
+    public String getExpireDate() {
+        return expireDate;
+    }
+
+    public void setExpireDate(String expireDate) {
+        this.expireDate = expireDate;
+    }
+
+    public String getCvn2() {
+        return cvn2;
+    }
+
+    public void setCvn2(String cvn2) {
+        this.cvn2 = cvn2;
+    }
+
 }

src/main/java/com/thinkgem/jeesite/modules/user/service/UserApiService.java

@@ -226,7 +226,7 @@ public class UserApiService {
         if(request.getCardSrc()!= null){
             cardSrc = request.getCardSrc().replace(Global.getConfig("sys.pre.url"), "");
         }
-        CardEntity cardEntity = new CardEntity(code, request.getSubMerchantCode(), request.getCardType(), request.getCardNo(), request.getCardMobile(), request.getBelongBank(), request.getCardBank(), request.getProvince()+request.getCity(), "N", subMerchantId, cardSrc, type, status, request.getProvince(), request.getCity());
+        CardEntity cardEntity = new CardEntity(code, request.getSubMerchantCode(), request.getCardType(), request.getCardNo(),request.getExpireDate(),request.getCvn2(), request.getCardMobile(), request.getBelongBank(), request.getCardBank(), request.getProvince()+request.getCity(), "N", subMerchantId, cardSrc, type, status, request.getProvince(), request.getCity());
         userDao.addNewCard(cardEntity);
     }
 
@@ -266,7 +266,7 @@ public class UserApiService {
         CardEntity cardStatusEntity = new CardEntity(request.getSubMerchantCode(), "N");
         userDao.updateCardStatus(cardStatusEntity);
         logger.debug("修改完银行卡信息");
-        CardEntity cardEntity = new CardEntity(IdGen.randomBase62(64), request.getSubMerchantCode(), "D", request.getCardNo(), request.getCardMobile(), request.getBelongBank(), request.getCardBank(), request.getCardPlace(), "Y", subMerchantId, "", type, status, request.getProvince(), request.getCity());
+        CardEntity cardEntity = new CardEntity(IdGen.randomBase62(64), request.getSubMerchantCode(), "D", request.getCardNo(), request.getExpireDate(), request.getCvn2(),request.getCardMobile(), request.getBelongBank(), request.getCardBank(), request.getCardPlace(), "Y", subMerchantId, "", type, status, request.getProvince(), request.getCity());
         userDao.addNewCard(cardEntity);
 
 

src/main/resources/mappings/modules/pay/OrderApiDao.xml

@@ -4,6 +4,7 @@
 
     <select id="getOrderList" resultType="com.thinkgem.jeesite.modules.pay.entity.OrderEntity">
         SELECT
+            DISTINCT o.`code`,
             o.pay_code,
             o.pay_no,
             o.pay_status,
@@ -20,10 +21,10 @@
         WHERE o.del_flag = 0
         AND o.user_code = #{subMerchantCode}
         <if test="payChannel != null and payChannel != ''">
-            AND o.pay_channel = #{payChannel}
+            AND o.pay_method = #{payChannel}
         </if>
         <if test="payMethod != null and payMethod != ''">
-            AND o.pay_channel = #{payMethod}
+            AND o.pay_method = #{payMethod}
         </if>
         <if test="payStatus != null and payStatus != ''">
             AND o.pay_status = #{payStatus}
@@ -59,7 +60,7 @@
         WHERE o.del_flag = 0
         AND o.user_code = #{subMerchantCode}
         <if test="payChannel != null and payChannel != ''">
-            AND o.pay_channel = #{payChannel}
+            AND o.pay_method = #{payChannel}
         </if>
         <if test="payStatus != null and payStatus != ''">
             AND o.pay_status = #{payStatus}

src/main/resources/mappings/modules/user/UserDao.xml

@@ -362,6 +362,8 @@
             user_code,
             card_type,
             card_no,
+            expire_date,
+            cvn2,
             card_mobile,
             belong_bank,
             card_bank,
@@ -378,7 +380,7 @@
             del_flag
         )
         VALUES
-            (#{code}, #{userCode}, #{cardType}, #{cardNo}, #{cardMobile}, #{belongBank}, #{cardBank}, #{cardPlace}, #{isDebit}, #{subMerchantId}, #{cardSrc}, #{type}, #{status}, #{province}, #{city}, #{createdUser}, #{modifiedUser}, #{delFlag})
+            (#{code}, #{userCode}, #{cardType}, #{cardNo}, #{expireDate}, #{cvn2}, #{cardMobile}, #{belongBank}, #{cardBank}, #{cardPlace}, #{isDebit}, #{subMerchantId}, #{cardSrc}, #{type}, #{status}, #{province}, #{city}, #{createdUser}, #{modifiedUser}, #{delFlag})
     </insert>
 
     <insert id="addFeedback">