|
@@ -1,4 +1,10 @@
|
|
package com.fdkankan.sale.service.impl;
|
|
package com.fdkankan.sale.service.impl;
|
|
|
|
+import com.fdkankan.sale.entity.OrderReceiving;
|
|
|
|
+import com.alibaba.fastjson.JSONArray;
|
|
|
|
+import com.fdkankan.sale.entity.CustomerAddress;
|
|
|
|
+import com.fdkankan.sale.entity.Customer;
|
|
|
|
+import com.fdkankan.sale.vo.response.RepairRegisterVo;
|
|
|
|
+import com.fdkankan.sale.entity.RepairTest;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
import com.fdkankan.common.util.SecurityUtil;
|
|
import com.fdkankan.common.util.SecurityUtil;
|
|
import com.fdkankan.sale.common.PageInfo;
|
|
import com.fdkankan.sale.common.PageInfo;
|
|
@@ -116,7 +122,7 @@ public class RepairInfoService {
|
|
* * * status 0待接单,10待检测,20待报价,30待确认,40已取消,50待备料,60维修中,70待测试,
|
|
* * * status 0待接单,10待检测,20待报价,30待确认,40已取消,50待备料,60维修中,70待测试,
|
|
* * * 80待支付(已完结),90待回收,100待发货,110已发货
|
|
* * * 80待支付(已完结),90待回收,100待发货,110已发货
|
|
*/
|
|
*/
|
|
- public Object getProcessByRepairId(String repairId,Long sysUserId) {
|
|
|
|
|
|
+ public Object getProcessByRepairId(String repairId) {
|
|
List<RepairLogVo> repairLogList = repairLogService.getVoByRepairId(repairId);
|
|
List<RepairLogVo> repairLogList = repairLogService.getVoByRepairId(repairId);
|
|
for (RepairLogVo repairLogVo : repairLogList) {
|
|
for (RepairLogVo repairLogVo : repairLogList) {
|
|
switch (repairLogVo.getRepairStatus()){
|
|
switch (repairLogVo.getRepairStatus()){
|
|
@@ -154,7 +160,27 @@ public class RepairInfoService {
|
|
break;
|
|
break;
|
|
}
|
|
}
|
|
}
|
|
}
|
|
- return repairLogList;
|
|
|
|
|
|
+ List<RepairLogVo> repairLogListVo = new ArrayList<>();
|
|
|
|
+ if(repairLogList.size() >0){
|
|
|
|
+ RepairLogVo repairLogVo = repairLogList.get(0);
|
|
|
|
+ RepairLogVo logVo = getNextStepVo(repairLogVo);
|
|
|
|
+ if(logVo!= null){
|
|
|
|
+ repairLogListVo.add(logVo);
|
|
|
|
+ }
|
|
|
|
+ repairLogListVo.addAll(repairLogList);
|
|
|
|
+ }
|
|
|
|
+ return repairLogListVo;
|
|
|
|
+ }
|
|
|
|
+
|
|
|
|
+ private RepairLogVo getNextStepVo(RepairLogVo repairLogVo) {
|
|
|
|
+ RepairLogVo log = new RepairLogVo();
|
|
|
|
+ log.setRepairId(repairLogVo.getRepairId());
|
|
|
|
+ log.setRepairStatus( repairLogVo.getRepairStatus() == 91 ? repairLogVo.getRepairStatus() + 9 :repairLogVo.getRepairStatus() + 10 );
|
|
|
|
+ if(log.getRepairStatus() >=RepairStatusEnum.OVER_SHIPPED.status()){
|
|
|
|
+ return null;
|
|
|
|
+ }
|
|
|
|
+ log.setRemark(RepairStatusEnum.getByStatus(log.getRepairStatus()).getMessage());
|
|
|
|
+ return log;
|
|
}
|
|
}
|
|
|
|
|
|
public Object pageList(RepairInfoListParam param) {
|
|
public Object pageList(RepairInfoListParam param) {
|