|
@@ -43,6 +43,8 @@ import vip.xiaonuo.biz.modular.bizappointmentrecord.entity.BizAppointmentRecord;
|
|
|
import vip.xiaonuo.biz.modular.bizappointmentrecord.mapper.BizAppointmentRecordMapper;
|
|
|
import vip.xiaonuo.biz.modular.bizappointmentrecord.param.BizAppointmentExportResult;
|
|
|
import vip.xiaonuo.biz.modular.bizappointmentrecord.service.BizAppointmentRecordService;
|
|
|
+import vip.xiaonuo.biz.modular.bizauditlog.entity.BizAuditLog;
|
|
|
+import vip.xiaonuo.biz.modular.bizauditlog.service.BizAuditLogService;
|
|
|
import vip.xiaonuo.biz.modular.bizconfig.entity.BizConfig;
|
|
|
import vip.xiaonuo.biz.modular.bizconfig.service.BizConfigService;
|
|
|
import vip.xiaonuo.biz.modular.bizorderconfig.entity.BizOrderConfig;
|
|
@@ -71,6 +73,7 @@ import java.math.BigDecimal;
|
|
|
import java.math.RoundingMode;
|
|
|
import java.net.URL;
|
|
|
import java.net.URLConnection;
|
|
|
+import java.util.Date;
|
|
|
import java.util.HashMap;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
@@ -113,6 +116,9 @@ public class BizOrderServiceImpl extends ServiceImpl<BizOrderMapper, BizOrder> i
|
|
|
@Resource
|
|
|
private BizOrderSupplierService bizOrderSupplierService;
|
|
|
|
|
|
+ @Resource
|
|
|
+ private BizAuditLogService bizAuditLogService;
|
|
|
+
|
|
|
@Resource(name = "loginUserApi")
|
|
|
private SaBaseLoginUserApi loginUserApi;
|
|
|
|
|
@@ -458,6 +464,29 @@ public class BizOrderServiceImpl extends ServiceImpl<BizOrderMapper, BizOrder> i
|
|
|
this.updateById(bizOrder);
|
|
|
}
|
|
|
|
|
|
+ @Transactional
|
|
|
+ @Override
|
|
|
+ public void endOrderSign(BizOrderEditParam bizOrderEditParam) {
|
|
|
+ BizOrder bizOrder = this.queryEntity(bizOrderEditParam.getId());
|
|
|
+ if(ObjectUtil.isEmpty(bizOrderEditParam.getEndSign())){
|
|
|
+ throw new CommonException("签名不能为空!");
|
|
|
+ }
|
|
|
+ String endSign = bizOrderEditParam.getEndSign();
|
|
|
+ if(bizOrderEditParam.getEndSign().contains(StrUtil.COMMA)) {
|
|
|
+ endSign = StrUtil.split(endSign, StrUtil.COMMA).get(1);
|
|
|
+ }
|
|
|
+ String base64 = ImgUtil.toBase64DataUri(ImgUtil.scale(ImgUtil.toImage(endSign),
|
|
|
+ 100, 50, null), ImgUtil.IMAGE_TYPE_PNG);
|
|
|
+
|
|
|
+ bizOrder.setEndSign(base64);
|
|
|
+ bizOrder.setOrderStatus("7");
|
|
|
+ bizOrder.setEndSignTime(new Date());
|
|
|
+ this.updateById(bizOrder);
|
|
|
+
|
|
|
+ //上传erp
|
|
|
+ sendOrderForErp(bizOrder);
|
|
|
+ }
|
|
|
+
|
|
|
@Transactional
|
|
|
@Override
|
|
|
public void orderConfirm(BizOrderEditParam bizOrderEditParam) {
|
|
@@ -491,7 +520,7 @@ public class BizOrderServiceImpl extends ServiceImpl<BizOrderMapper, BizOrder> i
|
|
|
BigDecimal result = orderBalance.divide(bizOrder.getOrderWeight(),2, BigDecimal.ROUND_HALF_UP).multiply(new BigDecimal(100));
|
|
|
if(result.compareTo(new BigDecimal(20)) <= 0){
|
|
|
//大于80%不需要审核
|
|
|
- bizOrder.setOrderStatus("7");
|
|
|
+ bizOrder.setOrderStatus("10");
|
|
|
|
|
|
//销售订单结束
|
|
|
BizSaleOrder bizSaleOrder = bizSaleOrderService.getById(bizOrder.getSaleOrderInfo());
|
|
@@ -501,7 +530,7 @@ public class BizOrderServiceImpl extends ServiceImpl<BizOrderMapper, BizOrder> i
|
|
|
}
|
|
|
|
|
|
//上传订单给erp
|
|
|
- sendOrderForErp(bizOrder);
|
|
|
+ //sendOrderForErp(bizOrder);
|
|
|
}else{
|
|
|
bizOrder.setOrderStatus("5");
|
|
|
}
|
|
@@ -512,6 +541,29 @@ public class BizOrderServiceImpl extends ServiceImpl<BizOrderMapper, BizOrder> i
|
|
|
this.updateById(bizOrder);
|
|
|
}
|
|
|
|
|
|
+ @Override
|
|
|
+ public void rejectOrder(BizOrderEditParam bizOrderEditParam) {
|
|
|
+ BizOrder bizOrder = this.queryEntity(bizOrderEditParam.getId());
|
|
|
+ //设置客户驳回状态
|
|
|
+ bizOrder.setOrderStatus("11");
|
|
|
+ this.updateById(bizOrder);
|
|
|
+
|
|
|
+ //插入审核记录
|
|
|
+ BizAuditLog bizAuditLog = new BizAuditLog();
|
|
|
+ bizAuditLog.setType("WLDD");
|
|
|
+ bizAuditLog.setDataId(bizOrder.getId());
|
|
|
+ bizAuditLog.setStatus("2");
|
|
|
+ bizAuditLog.setRemark(bizOrderEditParam.getEndRemark());
|
|
|
+ bizAuditLogService.save(bizAuditLog);
|
|
|
+ }
|
|
|
+
|
|
|
+ @Override
|
|
|
+ public void sendConfirm(BizOrderEditParam bizOrderEditParam) {
|
|
|
+ BizOrder bizOrder = this.queryEntity(bizOrderEditParam.getId());
|
|
|
+ bizOrder.setOrderStatus("4");
|
|
|
+ this.updateById(bizOrder);
|
|
|
+ }
|
|
|
+
|
|
|
public void sendOrderForErp(BizOrder bizOrder){
|
|
|
String code = null;
|
|
|
String msg = null;
|
|
@@ -599,6 +651,7 @@ public class BizOrderServiceImpl extends ServiceImpl<BizOrderMapper, BizOrder> i
|
|
|
}
|
|
|
}
|
|
|
|
|
|
+ @Transactional
|
|
|
@Override
|
|
|
public void auditOrder(BizOrderEditParam bizOrderEditParam) {
|
|
|
BizOrder bizOrder = this.queryEntity(bizOrderEditParam.getId());
|
|
@@ -610,7 +663,7 @@ public class BizOrderServiceImpl extends ServiceImpl<BizOrderMapper, BizOrder> i
|
|
|
//bizOrder.setOrderStatus("4");
|
|
|
status = "4";
|
|
|
}else{
|
|
|
- status = "7";
|
|
|
+ status = "10";
|
|
|
//bizOrder.setOrderStatus("7");
|
|
|
|
|
|
//销售订单结束
|
|
@@ -621,7 +674,7 @@ public class BizOrderServiceImpl extends ServiceImpl<BizOrderMapper, BizOrder> i
|
|
|
}
|
|
|
|
|
|
//上传订单给erp
|
|
|
- sendOrderForErp(bizOrder);
|
|
|
+ //sendOrderForErp(bizOrder);
|
|
|
}
|
|
|
updateWrapper.eq("id",bizOrder.getId()).
|
|
|
set("order_status",status).
|