|
|
|
@ -19,6 +19,9 @@ import cc.yunxi.mapper.RecycleOrderMapper;
|
|
|
|
|
import cc.yunxi.service.*;
|
|
|
|
|
import cn.hutool.core.util.ObjectUtil;
|
|
|
|
|
import cn.hutool.core.util.StrUtil;
|
|
|
|
|
import cn.hutool.json.JSONArray;
|
|
|
|
|
import cn.hutool.json.JSONObject;
|
|
|
|
|
import cn.hutool.json.JSONUtil;
|
|
|
|
|
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
|
|
|
|
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
|
|
|
|
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|
|
|
@ -61,6 +64,9 @@ public class RecycleOrderServiceImpl extends ServiceImpl<RecycleOrderMapper, Rec
|
|
|
|
|
@Resource
|
|
|
|
|
private IHousingEstateService housingEstateService;
|
|
|
|
|
|
|
|
|
|
@Resource
|
|
|
|
|
private IEnterpriseService enterpriseService;
|
|
|
|
|
|
|
|
|
|
/**
|
|
|
|
|
* 定点订单状态查询汇总
|
|
|
|
|
* 散户 UNPROCESSED | FINISHED | CANCELED
|
|
|
|
@ -185,7 +191,7 @@ public class RecycleOrderServiceImpl extends ServiceImpl<RecycleOrderMapper, Rec
|
|
|
|
|
recycleOrder.setOrderStatus(OrderStatusEnum.PENDING);
|
|
|
|
|
recycleOrder.setCreatorTime(now);
|
|
|
|
|
log.info("create recycleOrder info : {}", recycleOrder);
|
|
|
|
|
this.save(recycleOrder);
|
|
|
|
|
this.saveRecycleOrder(recycleOrder, recycleStation.getEnterpriseId());
|
|
|
|
|
|
|
|
|
|
// 创建订单明细
|
|
|
|
|
String orderId = recycleOrder.getId();
|
|
|
|
@ -226,7 +232,7 @@ public class RecycleOrderServiceImpl extends ServiceImpl<RecycleOrderMapper, Rec
|
|
|
|
|
recycleOrder.setOrderType(OrderTypeEnum.TM_RECOVERY);
|
|
|
|
|
recycleOrder.setOrderStatus(OrderStatusEnum.UNPROCESSED);
|
|
|
|
|
recycleOrder.setCreatorTime(LocalDateTime.now());
|
|
|
|
|
this.save(recycleOrder);
|
|
|
|
|
this.saveRecycleOrder(recycleOrder, housingInfo.getEnterpriseId());
|
|
|
|
|
|
|
|
|
|
return recycleOrder.getId();
|
|
|
|
|
}
|
|
|
|
@ -257,7 +263,7 @@ public class RecycleOrderServiceImpl extends ServiceImpl<RecycleOrderMapper, Rec
|
|
|
|
|
recycleOrder.setOrderStatus(OrderStatusEnum.FINISHED); // 直接完成
|
|
|
|
|
recycleOrder.setCreatorTime(now);
|
|
|
|
|
recycleOrder.setCompleteTime(now); // 完成时间
|
|
|
|
|
this.save(recycleOrder);
|
|
|
|
|
this.saveRecycleOrder(recycleOrder, recycler.getCompanyId());
|
|
|
|
|
|
|
|
|
|
// 创建订单明细
|
|
|
|
|
String orderId = recycleOrder.getId();
|
|
|
|
@ -433,4 +439,19 @@ public class RecycleOrderServiceImpl extends ServiceImpl<RecycleOrderMapper, Rec
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// 保存订单
|
|
|
|
|
private void saveRecycleOrder(RecycleOrder recycleOrder, String enterpriseId) {
|
|
|
|
|
Enterprise enterprise = enterpriseService.getEnterpriseById(enterpriseId, false);
|
|
|
|
|
String companyId = enterprise.getId();
|
|
|
|
|
String companyPid = enterprise.getPid();
|
|
|
|
|
JSONArray jsonArray = JSONUtil.createArray();
|
|
|
|
|
jsonArray.add(companyPid);
|
|
|
|
|
jsonArray.add(companyId);
|
|
|
|
|
String organizeJsonId = jsonArray.toJSONString(0);
|
|
|
|
|
recycleOrder.setCompanyId(companyId);
|
|
|
|
|
recycleOrder.setOrganizeJsonId(organizeJsonId);
|
|
|
|
|
this.save(recycleOrder);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|