submit

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/service/impl/TopOldOrderServiceImpl.java

@@ -613,7 +613,10 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
         //订单商品
         if (CollectionUtils.isNotEmpty(bo.getOrderGoodsList())) {
             //删除之前关联重新添加
-           topOrderGoodsService.remove(new LambdaQueryWrapper<TopOldOrderGoods>().eq(TopOldOrderGoods::getOrderSn, edit.getOrderSn()));
+//           topOrderGoodsService.remove(new LambdaQueryWrapper<TopOldOrderGoods>().eq(TopOldOrderGoods::getOrderSn, edit.getOrderSn()));
+            topOrderGoodsService.update(new LambdaUpdateWrapper<TopOldOrderGoods>()
+                    .eq(TopOldOrderGoods::getOrderSn,edit.getOrderSn())
+                    .set(TopOldOrderGoods::getStatus,-1));
            List<TopOldOrderGoods> collect = bo.getOrderGoodsList().stream().map(item -> BeanUtil.toBean(item, TopOldOrderGoods.class)).collect(Collectors.toList());
             //学员身份证加密
             collect.forEach(x -> {
@@ -630,13 +633,17 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
         //订单附件
         if (CollectionUtils.isNotEmpty(bo.getOrderAttachmentList())) {
             //删除之前关联重新添加
-            topOrderAttachmentService.remove(new LambdaQueryWrapper<TopOldOrderAttachment>().eq(TopOldOrderAttachment::getOrderSn, edit.getOrderSn()));
+//            topOrderAttachmentService.remove(new LambdaQueryWrapper<TopOldOrderAttachment>().eq(TopOldOrderAttachment::getOrderSn, edit.getOrderSn()));
+            topOrderAttachmentService.update(new LambdaUpdateWrapper<TopOldOrderAttachment>()
+                                .eq(TopOldOrderAttachment::getOrderSn,edit.getOrderSn())
+                                .set(TopOldOrderAttachment::getStatus,-1));
             List<TopOldOrderAttachment> collect = bo.getOrderAttachmentList().stream().map(item -> BeanUtil.toBean(item, TopOldOrderAttachment.class)).collect(Collectors.toList());
             topOrderAttachmentService.saveBatch(collect);
         }
         //重新计算成本
         if (StringUtils.isNotBlank(order.getCostJson())) {
             recalculateCost(order.getCostJson(),edit);
+            edit.setCostJson(order.getCostJson());
         }
         this.updateById(edit);
         return true;
@@ -1138,6 +1145,9 @@ public class TopOldOrderServiceImpl extends ServiceImpl<TopOldOrderMapper, TopOl
                 if (!respone.contains("\"Status\":true")) {
                     throw new CustomException("旧系统订单审核接口请求错误");
                 }
+                if (respone.contains("\"ErrorCode\":1081")) {
+                    throw new CustomException("业务员正在修改订单，请勿审核！");
+                }
             } catch (IOException e) {
                 log.error("旧系统订单审核接口请求错误" + respone);
                 throw new CustomException("旧系统订单审核接口请求错误");