|
@@ -1713,6 +1713,16 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
|
|
|
request.setId(detail.getId());
|
|
|
request.setBrandId(brand.getBrandId());
|
|
|
ItfTblWxjsJyktUpload jykt = detailOrderRepairMapper.getItfTblWxjsJyktUpload(request);
|
|
|
+
|
|
|
+ if (jykt.getBwgsj()==null && orderBase.getOverTime() !=null){
|
|
|
+ jykt.setBwgsj(orderBase.getOverTime());
|
|
|
+ }
|
|
|
+ if (jykt.getBwgsj()==null){
|
|
|
+ jykt.setBwgsj(new Date());
|
|
|
+ }
|
|
|
+
|
|
|
+ // 1=已结算,2=待结算
|
|
|
+ jykt.setJszt("2");
|
|
|
// 这里可以填写一个自生成的值
|
|
|
if (StringUtils.isEmpty(jykt.getPgmxid())){
|
|
|
jykt.setPgmxid(IdWorker.getIdStr());
|
|
@@ -1726,6 +1736,9 @@ public class RepairProduceDataUploadServiceImpl implements RepairProduceDataUplo
|
|
|
jykt.setWxwdmc(websitSH.getWdmc());
|
|
|
// 提取安装师傅的账号信息
|
|
|
jykt.setCzrid(String.valueOf(publicService.getBrandWorkerId(orderBase.getWorkerId(),websitSH.getWdId(),brand.getBrandId(),orderBase.getWebsitId())));
|
|
|
+ jykt.setWxgid(Long.valueOf(jykt.getCzrid()));
|
|
|
+ jykt.setWxgdh(orderBase.getWorkerMobile());
|
|
|
+
|
|
|
|
|
|
// 结算网点编号即售后网点处理
|
|
|
websitSH = publicService.ptshwdToshshwd(jykt.getJswdno(),orderBase.getMainId());
|