预发机申请新增循环结束时间

kxs-store/kxs-store-biz/src/main/java/com/kxs/store/biz/service/impl/KxsMachineApplyServiceImpl.java

@@ -8,6 +8,7 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.kxs.common.core.constant.CommonConstants;
 import com.kxs.common.core.constant.SecurityConstants;
 import com.kxs.common.core.constant.enums.*;
 import com.kxs.common.core.exception.GlobalCustomerException;
@@ -232,18 +233,18 @@ public class KxsMachineApplyServiceImpl extends ServiceImpl<KxsMachineApplyMappe
                 //修改机具已出库
                 adMachine.setStatus(MachineTypeEnum.STATUS_OUT.getType());
                 adMachine.setDeliveryTime(LocalDateTime.now());
-                //如果是循环申请则继承循环机时间
-                if(param.getApplyType().equals(MachineOrderEnum.M_TYPE_RE.getType())){
-                    //继承循环起止时间并变更为可循环
-                    adMachine.setRecycleEndTime(recycleEndTime);
-                    adMachine.setRecycleStatus(MachineRecycleStatusEnum.UN_RECYCLE_STATUS.getType());
+                //如果是兑换券申请则更新循环时间
+                if(!param.getApplyType().equals(MachineOrderEnum.M_TYPE_RE.getType())){
+                    recycleEndTime = LocalDateTime.now();
                 }
+                adMachine.setRecycleEndTime(recycleEndTime);
+                adMachine.setRecycleStatus(MachineRecycleStatusEnum.CAN_RECYCLE_STATUS.getType());
                 R<Boolean> result = remoteKxsProductService.updateByMachine(adMachine, SecurityConstants.FROM_IN);
                 if(!result.getData()){
                     throw new GlobalCustomerException(ErrorTypeEnum.REMOTE_DATA_ERROR.getDescription());
                 }
                 //机具已绑定 机具满足激活条件 && 绑定至申请时间 ≤ 30min
-                if (adMachine.getBindStatus() == 1 ) {
+                if (Objects.equals(adMachine.getBindStatus(), CommonConstants.SUCCESS)) {
                     LocalDateTime bindTime = adMachine.getBindTime().plusMinutes(30);
                     if (bindTime.isAfter(LocalDateTime.now())) {
                         //TODO 走自动补录流程
@@ -251,7 +252,7 @@ public class KxsMachineApplyServiceImpl extends ServiceImpl<KxsMachineApplyMappe
                     }
                 }
                 //修改预发机状态
-                kxsMachineAdvanceInfo.setIsApply(1);
+                kxsMachineAdvanceInfo.setIsApply(CommonConstants.SUCCESS);
                 kxsMachineAdvanceInfoMapper.updateById(kxsMachineAdvanceInfo);
 
                 //订单详情添加机具号