|
|
@@ -1285,7 +1285,7 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
|
|
|
}
|
|
|
});
|
|
|
//消息通知教务
|
|
|
- this.informRemind(userNames);
|
|
|
+// this.informRemind(userNames);
|
|
|
break;
|
|
|
case 2: //审核未通过
|
|
|
topOldOrderGoods.forEach(item -> {
|
|
|
@@ -1319,40 +1319,40 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-// //重新计算成本
|
|
|
-// if (bo.getCheckStatus() == 1 && StringUtils.isNotBlank(oldOrder.getCostJson())) {
|
|
|
-// recalculateCost(oldOrder.getCostJson(), oldOrder);
|
|
|
-// }
|
|
|
-// //清除标识IDs
|
|
|
-// oldOrder.setCheckRemark("");
|
|
|
-// updateById(oldOrder);
|
|
|
-// // 订单审核通知业务系统
|
|
|
-// List<CheckOrderStudentDetailBo> studentDetailBos = list.stream().map(item -> {
|
|
|
-// CheckOrderStudentDetailBo detailBo = new CheckOrderStudentDetailBo();
|
|
|
-// detailBo.setGoodsId(item.getGoodsId());
|
|
|
-// detailBo.setOrderUserItemId(item.getSignId().intValue());
|
|
|
-// detailBo.setUserName(item.getUserName());
|
|
|
-// detailBo.setIdNum(item.getUserCard());
|
|
|
-// return detailBo;
|
|
|
-// }).collect(Collectors.toList());
|
|
|
-// CheckOrderStudentBo studentBo = new CheckOrderStudentBo();
|
|
|
-// Long nowTime = DateUtils.getNowTime();
|
|
|
-// String sign = ToolsUtils.EncoderByMd5(bo.getOrderSn() + nowTime.toString() + "pubilc2022");
|
|
|
-// studentBo.setStamp(nowTime);
|
|
|
-// studentBo.setSign(sign);
|
|
|
-// studentBo.setOrderSn(bo.getOrderSn());
|
|
|
-// studentBo.setAuditStatus(bo.getCheckStatus());
|
|
|
-// studentBo.setData(studentDetailBos);
|
|
|
-// String respone = "";
|
|
|
-// try {
|
|
|
-// respone = HttpUtils.sendPostHeader(CHECK_ORDER_STUDENT, JSONObject.parseObject(JSONObject.toJSONString(studentBo)), new HashMap<>());
|
|
|
-// if (!respone.contains("\"Status\":true")) {
|
|
|
-// throw new CustomException("旧系统重新审核接口接口请求错误");
|
|
|
-// }
|
|
|
-// } catch (Exception e) {
|
|
|
-// log.error("旧系统重新审核接口接口请求错误" + respone);
|
|
|
-// throw new CustomException("旧系统重新审核接口接口请求错误");
|
|
|
-// }
|
|
|
+ //重新计算成本
|
|
|
+ if (bo.getCheckStatus() == 1 && StringUtils.isNotBlank(oldOrder.getCostJson())) {
|
|
|
+ recalculateCost(oldOrder.getCostJson(), oldOrder);
|
|
|
+ }
|
|
|
+ //清除标识IDs
|
|
|
+ oldOrder.setCheckRemark("");
|
|
|
+ updateById(oldOrder);
|
|
|
+ // 订单审核通知业务系统
|
|
|
+ List<CheckOrderStudentDetailBo> studentDetailBos = list.stream().map(item -> {
|
|
|
+ CheckOrderStudentDetailBo detailBo = new CheckOrderStudentDetailBo();
|
|
|
+ detailBo.setGoodsId(item.getGoodsId());
|
|
|
+ detailBo.setOrderUserItemId(item.getSignId().intValue());
|
|
|
+ detailBo.setUserName(item.getUserName());
|
|
|
+ detailBo.setIdNum(item.getUserCard());
|
|
|
+ return detailBo;
|
|
|
+ }).collect(Collectors.toList());
|
|
|
+ CheckOrderStudentBo studentBo = new CheckOrderStudentBo();
|
|
|
+ Long nowTime = DateUtils.getNowTime();
|
|
|
+ String sign = ToolsUtils.EncoderByMd5(bo.getOrderSn() + nowTime.toString() + "pubilc2022");
|
|
|
+ studentBo.setStamp(nowTime);
|
|
|
+ studentBo.setSign(sign);
|
|
|
+ studentBo.setOrderSn(bo.getOrderSn());
|
|
|
+ studentBo.setAuditStatus(bo.getCheckStatus());
|
|
|
+ studentBo.setData(studentDetailBos);
|
|
|
+ String respone = "";
|
|
|
+ try {
|
|
|
+ respone = HttpUtils.sendPostHeader(CHECK_ORDER_STUDENT, JSONObject.parseObject(JSONObject.toJSONString(studentBo)), new HashMap<>());
|
|
|
+ if (!respone.contains("\"Status\":true")) {
|
|
|
+ throw new CustomException("旧系统重新审核接口接口请求错误");
|
|
|
+ }
|
|
|
+ } catch (Exception e) {
|
|
|
+ log.error("旧系统重新审核接口接口请求错误" + respone);
|
|
|
+ throw new CustomException("旧系统重新审核接口接口请求错误");
|
|
|
+ }
|
|
|
|
|
|
//审核通过消息通知
|
|
|
if (bo.getCheckStatus() == 1){
|
