提交获取指令功能

zhywpt-service-inss/src/main/java/cn/com/taiji/inss/manager/inst/InstCard0015ReadHandler.java

@@ -13,7 +13,6 @@ public class InstCard0015ReadHandler extends AbstractCommandHandler {
     @Override
     IssueOrderVO handleInternal(IssueOrderVO vo, String cmdResultsStr) throws ServiceHandleException {
         vo.setCmdType("CARD");
-        vo.setValidCard(true);
         return vo;
     }
 

zhywpt-service-inss/src/main/java/cn/com/taiji/inss/manager/inst/InstCard0015WriteHandler.java

@@ -19,7 +19,6 @@ import cn.com.taiji.inss.manager.vfj.VfjUpdateFile0015Manager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 

zhywpt-service-inss/src/main/java/cn/com/taiji/inss/manager/inst/InstCard0016WriteHandler.java

@@ -67,10 +67,10 @@ public class InstCard0016WriteHandler extends AbstractCommandHandler {
     }
 
     private void handleFile(IssueOrderVO vo, File0016 file0016) throws ServiceHandleException, FormatException {
-        QtkCustomerInfo customerinfo = customerInfoRepo.findByCustomerId(vo.getUserId());
-        file0016.setCustomerIdNum(customerinfo.getCustomerIdNum());
-        file0016.setCustomerIdType(convertIdType(customerinfo.getCustomerIdType().getCode()));
-        file0016.setCustomerName(customerinfo.getCustomerName());
+        QtkCustomerInfo customerInfo = customerInfoRepo.findByCustomerId(vo.getUserId());
+        file0016.setCustomerIdNum(customerInfo.getCustomerIdNum());
+        file0016.setCustomerIdType(convertIdType(customerInfo.getCustomerIdType().getCode()));
+        file0016.setCustomerName(customerInfo.getCustomerName());
     }
 
     /**

zhywpt-service-inss/src/main/java/cn/com/taiji/inss/manager/inst/InstObuSystemInfoReadHandler.java

@@ -13,7 +13,6 @@ public class InstObuSystemInfoReadHandler extends AbstractCommandHandler {
     @Override
     IssueOrderVO handleInternal(IssueOrderVO vo, String cmdResultsStr) throws ServiceHandleException {
         vo.setCmdType("OBU");
-        vo.setValidObu(true);
         return vo;
     }
 

zhywpt-service-inss/src/main/java/cn/com/taiji/inss/manager/inst/InstObuSystemInfoWriteHandler.java

@@ -32,12 +32,6 @@ public class InstObuSystemInfoWriteHandler extends AbstractCommandHandler {
     IssueOrderVO handleInternal(IssueOrderVO vo, String cmdResultsStr) throws ServiceHandleException {
         vo.setCmdType("OBU");
         try {
-            IssueOrderinfo orderInfo = orderinfoRepo.findByOrderNo(vo.getOrderId());
-            // 如果OBU已经发行，跳过OBU发行
-            if (orderInfo.getObuStatus() == ObuStatus.ZC) {
-                copyProperties(orderInfo, vo);
-                return vo.setObuStatus(orderInfo.getObuStatus());
-            }
             SystemInfoFile systemInfo = toSystemInfo(cmdResultsStr);
             vo.setRandomCode(toRandomCode(cmdResultsStr));
             LocalDateTime enableTime = LocalDateTime.now();

zhywpt-service-inss/src/main/java/cn/com/taiji/inss/manager/inst/InstOnlineActiveMananger.java

@@ -229,7 +229,12 @@ public class InstOnlineActiveMananger extends AbstractCallBackManager {
             vo.setValidOrder(true);
             vo.setSaveObu(true);
             vo.setSaveOrder(true);
+        } else if (request.getStepNo() == 1) {
+            vo.setValidCard(true);
+        } else if (request.getStepNo() == 13) {
+            vo.setValidObu(true);
         }
+
         if (vo.getChargeMoney() == null)
             return request.getStepNo() + 1;
         else if (vo.getCardType() != CardType.CHARGE_CARD && request.getStepNo() == 8)
@@ -400,7 +405,7 @@ public class InstOnlineActiveMananger extends AbstractCallBackManager {
         }
         if ("52010102005".equals(orderInfo.getAccountId()))
             cardInfo.setAccountId("52010102007");
-        cardInfoRepo.save(cardInfo);
+        cardInfoRepo.persist(cardInfo);
         return cardInfo;
     }
 
@@ -457,11 +462,12 @@ public class InstOnlineActiveMananger extends AbstractCallBackManager {
             obuInfo.setObuEnableTime(vo.getObuEnableTime());
             obuInfo.setObuExpireTime(vo.getObuExpireTime());
         }
-        obuInfoRepo.save(obuInfo);
+        obuInfoRepo.persist(obuInfo);
         //通知渠道
         if (orderInfo.getOrderSource() == SourceType.CHANNEL) {
             qdCallUtil.callBackQd(orderInfo, "");
             //公众号通知
+
         }
         return obuInfo;