更换设备

gly-base-core/src/main/java/cn/com/taiji/core/entity/ass/AssDeviceReplace.java

@@ -27,10 +27,10 @@ public class AssDeviceReplace extends AbstractStringPropertyUUIDEntity {
     private String orderNo;// 订单编号
     @Column(name = "REPLACE_TYPE")
     private Integer replaceType;// 类型 1-卡签 2-卡 3-签
-//    @NotNull
+    @NotNull
     @Column(name = "SEND_BACK")
     private Boolean sendBack;// 寄回旧设备
-//    @NotNull
+    @NotNull
     @Column(name = "NEED_POST")
     private Boolean needPost;// 需要邮寄
     @Column(name = "CARD_WARRANTY_TIME")

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/ass/deviceReplace/DeviceReplaceApply2Manager.java → zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/ass/deviceReplace/DeviceReplaceApplyManager.java

@@ -45,7 +45,7 @@ import java.time.LocalDateTime;
 
 
 @Service
-public class DeviceReplaceApply2Manager extends AbstractCommManager implements LogManager<DeviceReplaceApplyRequest, DeviceReplaceApplyResponse, IasInterfaceLog> {
+public class DeviceReplaceApplyManager extends AbstractCommManager implements LogManager<DeviceReplaceApplyRequest, DeviceReplaceApplyResponse, IasInterfaceLog> {
 
     @Autowired
     private IasInterfaceLogRepo logRepo;
@@ -100,7 +100,12 @@ public class DeviceReplaceApply2Manager extends AbstractCommManager implements L
     private void createDeviceReplace(DeviceReplaceApplyRequest request, String orderNo) {
         AssDeviceReplace deviceReplace = copyProperties(request, new AssDeviceReplace());
         deviceReplace.setOrderNo(orderNo);
-        deviceReplace.setPayee(SourceType.findByName(request.getOrderSource()) != SourceType.CHANNEL ? 1 : 2);
+        SourceType sourceType = SourceType.findByName(request.getOrderSource());
+        deviceReplace.setPayee(sourceType != SourceType.CHANNEL ? 1 : 2);
+        if (sourceType == SourceType.CHANNEL){
+            deviceReplace.setSendBack(false);
+            deviceReplace.setNeedPost(false);
+        }
         deviceReplaceRepo.save(deviceReplace);
     }
 

zhywpt-service-ias/src/main/java/cn/com/taiji/ias/manager/handler/AssServiceHandler.java

@@ -1,6 +1,5 @@
 package cn.com.taiji.ias.manager.handler;
 
-import cn.com.taiji.ias.manager.ass.deviceReplace.DeviceReplaceApply2Manager;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -15,6 +14,7 @@ import cn.com.taiji.core.model.comm.protocol.ias.IasServiceType;
 import cn.com.taiji.core.model.comm.protocol.ias.ass.*;
 import cn.com.taiji.core.model.comm.protocol.ias.ass.vehicleInfoChange.VehicleChangeCancelRequest;
 import cn.com.taiji.ias.manager.ass.*;
+import cn.com.taiji.ias.manager.ass.deviceReplace.DeviceReplaceApplyManager;
 import cn.com.taiji.ias.manager.ass.active.ActiveObuManager;
 import cn.com.taiji.ias.manager.ass.active.ActiveQueryVehicleManager;
 import cn.com.taiji.ias.manager.ass.active.ActiveSaveRecordManager;
@@ -110,7 +110,7 @@ public class AssServiceHandler extends AbstractIasServiceHandler<AssServiceCmd>
     @Autowired
     private DeviceEnableApplyManager deviceEnableApplyManager;
     @Autowired
-    private DeviceReplaceApply2Manager deviceReplaceApplyManager;
+    private DeviceReplaceApplyManager deviceReplaceApplyManager;
 
 
     public AssServiceHandler() {