liujunchi 2 rokov pred
rodič
commit
a6d190ee50

+ 5 - 3
mec-mall/mall-portal/src/main/java/com/yonge/cooleshow/portal/service/impl/OmsPortalOrderServiceImpl.java

@@ -126,17 +126,19 @@ public class OmsPortalOrderServiceImpl implements OmsPortalOrderService {
         if (!StringUtil.isEmpty(orderParam.getOrderNo())) {
             // 订单号不为空 先删除订单  在重新创建订单
             OmsOrderDetail detail = detail(orderParam.getOrderNo());
-            if (detail != null) {
+            if (detail != null && detail.getStatus() == 0) {
                 detail.setStatus(4);
                 orderMapper.updateByPrimaryKeySelective(detail);
+                // 另外生成一个订单
                 detail.setId(null);
+                detail.setStatus(0);
                 detail.setOrderSn(orderSn);
-                orderMapper.insert(detail);
                 List<OmsOrderItem> orderItemList = detail.getOrderItemList();
+                orderMapper.insert(detail);
                 for (OmsOrderItem omsOrderItem : orderItemList) {
                     omsOrderItem.setId(null);
                     omsOrderItem.setOrderSn(detail.getOrderSn());
-                    omsOrderItem.setOrderId(order.getId());
+                    omsOrderItem.setOrderId(detail.getId());
                 }
                 orderItemDao.insertList(orderItemList);