1

src/main/java/com/fdkankan/sale/service/ICustomerAddressService.java

@@ -13,7 +13,7 @@ import com.baomidou.mybatisplus.extension.service.IService;
  */
 public interface ICustomerAddressService extends IService<CustomerAddress> {
 
-    void setTrackingNumByRepairId(String repairId, String sendTrackingNum);
+    void setTrackingNumByRepairId(String repairId,Integer getType, String sendTrackingNum);
 
     CustomerAddress getByRepairId(String repairId);
 }

src/main/java/com/fdkankan/sale/service/impl/CustomerAddressServiceImpl.java

@@ -7,6 +7,7 @@ import com.fdkankan.sale.mapper.ICustomerAddressMapper;
 import com.fdkankan.sale.service.ICustomerAddressService;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.stereotype.Service;
+import org.springframework.util.StringUtils;
 
 /**
  * <p>
@@ -20,10 +21,13 @@ import org.springframework.stereotype.Service;
 public class CustomerAddressServiceImpl extends ServiceImpl<ICustomerAddressMapper, CustomerAddress> implements ICustomerAddressService {
 
     @Override
-    public void setTrackingNumByRepairId(String repairId, String sendTrackingNum) {
+    public void setTrackingNumByRepairId(String repairId, Integer getType,String sendTrackingNum) {
         LambdaUpdateWrapper<CustomerAddress> wrapper = new LambdaUpdateWrapper<>();
         wrapper.eq(CustomerAddress::getRepairId,repairId);
-        wrapper.set(CustomerAddress::getGetTrackingNum,sendTrackingNum);
+        wrapper.set(CustomerAddress::getGetType,getType);
+        if(!StringUtils.isEmpty(sendTrackingNum)){
+            wrapper.set(CustomerAddress::getGetTrackingNum,sendTrackingNum);
+        }
         this.update(wrapper);
     }
 

src/main/java/com/fdkankan/sale/service/impl/RepairSaleService.java

@@ -230,7 +230,7 @@ public class RepairSaleService {
     }
 
     public void sendRegister(PayRegisterParam param,Long userId) {
-        if(StringUtils.isBlank(param.getRepairId()) ){
+        if(StringUtils.isBlank(param.getRepairId()) || param.getGetType() == null){
             throw new BusinessException(ResultCode.MISSING_REQUIRED_PARAMETERS);
         }
         Repair repair = repairService.getById(param.getRepairId());
@@ -240,7 +240,7 @@ public class RepairSaleService {
         if(repair.getStatus() !=10){
             throw new BusinessException(ResultCode.REPAIR_STATUS_NOT_EXITS);
         }
-        customerAddressService.setTrackingNumByRepairId(repair.getRepairId(),param.getTrackingNum());
+        customerAddressService.setTrackingNumByRepairId(repair.getRepairId(),param.getGetType(),param.getTrackingNum());
         repairLogService.saveBySysUser(userId,param.getRepairId(),11,"发货登记");
 
     }

src/main/java/com/fdkankan/sale/vo/request/PayRegisterParam.java

@@ -10,4 +10,5 @@ public class PayRegisterParam {
     private JSONArray payImg;
 
     private String trackingNum;
+    private String getType;
 }