修改卡日志

xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/BindCardInfo.java

@@ -63,7 +63,6 @@ public class BindCardInfo {
      * 卡押金
      */
     @JsonProperty("cashPledge")
-    @NotNull(message = "cashPledge的参数名不正确或者cashPledge的值为空，请检查传入参数")
     private Long cashPledge;
 
 }

xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/domain/QueryRechargingRecordResponse.java

@@ -4,6 +4,7 @@ import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -45,6 +46,16 @@ public class QueryRechargingRecordResponse {
          */
         @JsonProperty("orderNumber")
         private String orderNumber;
+        /**
+         * 订单编号
+         */
+        @JsonProperty("rechargeOrderNumber")
+        private String rechargeOrderNumber;
+        /**
+         * 充值金额
+         */
+        @JsonProperty("amount")
+        private BigDecimal amount;
         /**
          * 充值金额
          */
@@ -55,17 +66,31 @@ public class QueryRechargingRecordResponse {
          */
         @JsonProperty("rechargeMethod")
         private String rechargeMethod;
+        /**
+         * 充值方式（1 微信 2 支付宝 3 平台 4 卡机设备)
+         */
+        @JsonProperty("type")
+        private Integer type;
         /**
          * 订单状态（0待支付 1充值成功，2充值失败）
          */
         @JsonProperty("orderStatus")
         private Integer orderStatus;
+        /**
+         * 订单状态（0待支付 1充值成功，2充值失败）
+         */
+        @JsonProperty("status")
+        private Integer status;
         /**
          * 创建时间
          */
         @JsonProperty("createTime")
         private String createTime;
-
+        /**
+         * 用户类型  8离线端
+         */
+        @JsonProperty("source")
+        private Integer source;
     }
 
 }

xhpc-modules/xhpc-card/src/main/java/com/xhpc/card/service/impl/XhpcCardServiceImpl.java

@@ -20,6 +20,7 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -398,7 +399,7 @@ public class XhpcCardServiceImpl implements IXhpcCardService {
         TIccardInfo tIccardInfo = new TIccardInfo();
         tIccardInfo.setId(bindCardInfo.getCardRecordId());
         tIccardInfo.setStatus(1);
-        tIccardInfo.setCashpledge(Math.toIntExact(bindCardInfo.getCashPledge()));
+        //tIccardInfo.setCashpledge(Math.toIntExact(bindCardInfo.getCashPledge()));
         tIccardInfoMapper.updateByPrimaryKeySelective(tIccardInfo);
         xhpcCardMapper.insertSelective(xhpcIcCardInfo);
         //write log info
@@ -419,7 +420,7 @@ public class XhpcCardServiceImpl implements IXhpcCardService {
         cardInfoDTO.setPassword(tIccardInfo.getPassword());
         cardInfoDTO.setUserIndex(tIccardInfo.getUserindex());
         cardInfoDTO.setCorpNo(tIccardInfo.getCorpno());
-        cardInfoDTO.setCashPledge(tIccardInfo.getCashpledge());
+        //cardInfoDTO.setCashPledge(tIccardInfo.getCashpledge());
         cardInfoDTO.setBalance(tIccardInfo.getBalance());
         cardInfoDTO.setStatus(tIccardInfo.getStatus());
         cardInfoDTO.setPrepay(null);
@@ -562,7 +563,9 @@ public class XhpcCardServiceImpl implements IXhpcCardService {
             dataDTO.setGrantOperatorName(operator.getName());
             dataDTO.setCardSerialNumber(tIccardLog.getUniqueid());
             dataDTO.setOperate(Integer.valueOf(tIccardLog.getOperate()));
-            dataDTO.setCashPledge(Long.valueOf(cardInfo.getCashPledge()));
+            if(cardInfo.getCashPledge() !=null){
+                dataDTO.setCashPledge(Long.valueOf(cardInfo.getCashPledge()));
+            }
             Integer balance = cardInfo.getBalance();
             if (balance != null) {
                 dataDTO.setBalance(Long.valueOf(balance));
@@ -642,12 +645,17 @@ public class XhpcCardServiceImpl implements IXhpcCardService {
                 dataDTO.setUserAccount(accountStr);
                 //Get orderNumber（not found in the MySQL database）
                 dataDTO.setOrderNumber(null);
+                dataDTO.setRechargeOrderNumber(null);
                 //Get rechargeMoney
+                dataDTO.setAmount(new BigDecimal(cardInfo.getPrepay()));
                 dataDTO.setRechargeMoney(Long.valueOf(cardInfo.getPrepay()));
                 //Get rechargeMethod (not found in the MySQL database)
                 dataDTO.setRechargeMethod("4");
                 dataDTO.setOrderStatus(1);
+                dataDTO.setStatus(1);
+                dataDTO.setType(4);
                 dataDTO.setCreateTime(MyDateUtil.parseDateToStr(tIccardLog.getCreatetime()));
+                dataDTO.setSource(8);
                 queryRechargingRecordResponse.getData().add(dataDTO);
             }
             return R.ok(queryRechargingRecordResponse);

xhpc-modules/xhpc-card/src/main/resources/mapper/TIccardLogMapper.xml

@@ -38,6 +38,7 @@
                 AND operate = #{operateType}
             </if>
         </where>
+        order by createTime desc
         LIMIT #{currentPage},#{items}
     </select>
     <select id="selectCountByCondition" resultType="java.lang.Long">

xhpc-modules/xhpc-charging-station/src/main/java/com/xhpc/charging/station/controller/XhpcTimingChargingModelController.java

@@ -90,9 +90,9 @@ public class XhpcTimingChargingModelController extends BaseController {
     }
 
     /**
-     * 每5分钟执行一次
+     * 每30秒执行一次
      */
-    @Scheduled(cron = "0 0/1 * * * ?")
+    @Scheduled(cron = "0/30 * * * * ?")
     public void getXhpcTimingChargingModelCron(){
         xhpcTimingChargingModelService.getXhpcTimingChargingModelCron();
     }