订单修改接口

ship-module-trade/ship-module-trade-api/src/main/java/com/yc/ship/module/trade/enums/ErrorCodeConstants.java

@@ -71,6 +71,7 @@ public interface ErrorCodeConstants {
     ErrorCode ORDER_SAVE_EXCEPTION = new ErrorCode(30_001, "订单保存异常");
     ErrorCode SUPPLIER_ORDER_CREATE_FAIL = new ErrorCode(30_002, "供应商订单下单失败");
     ErrorCode ORDER_CREATE_FAIL = new ErrorCode(30_003, "下单失败");
+    ErrorCode ORDER_MODIFY_FAIL = new ErrorCode(30_003, "订单修改失败");
     ErrorCode ORDER_OTC_FAIL = new ErrorCode(30_003, "当前登录用户不是旅行社");
     ErrorCode ORDER_STORE_FAIL = new ErrorCode(30_003, "当前登录用户不是门店");
     ErrorCode ORDER_OTC_NONE = new ErrorCode(30_003, "该旅行社不存在");

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/order/impl/TradeOrderRepositoryServiceImpl.java

@@ -148,25 +148,61 @@ public class TradeOrderRepositoryServiceImpl implements TradeOrderRepositoryServ
     @Transactional(rollbackFor = Exception.class)
     public void modifyOrder(TradeOrderBO tradeOrderBO) {
         try {
+            tradeOrderMapper.updateById(tradeOrderBO.getTradeOrderDO());
 
-            tradeOrderMapper.insert(tradeOrderBO.getTradeOrderDO());
+            orderJzMapper.delete(new LambdaUpdateWrapper<OrderJzDO>().eq(OrderJzDO::getOrderId, tradeOrderBO.getTradeOrderDO().getId()));
             orderJzMapper.insert(tradeOrderBO.getOrderJzDO());
+
+            tradeOrderUserMapper.update(new LambdaUpdateWrapper<TradeOrderUserDO>().set(TradeOrderUserDO::getDeleted, 1).set(TradeOrderUserDO::getUpdateTime,new Date()).eq(TradeOrderUserDO::getOrderId, tradeOrderBO.getTradeOrderDO().getId()));
             tradeOrderUserMapper.insert(tradeOrderBO.getTradeOrderUserDO());
 
             if(tradeOrderBO.getTradeOrderDeliveryDO() !=null) {
+                tradeOrderDeliveryMapper.update(new LambdaUpdateWrapper<TradeOrderDeliveryDO>()
+                        .set(TradeOrderDeliveryDO::getDeleted, 1)
+                        .set(TradeOrderDeliveryDO::getUpdateTime,new Date())
+                        .eq(TradeOrderDeliveryDO::getOrderId, tradeOrderBO.getTradeOrderDO().getId())
+                );
                 tradeOrderDeliveryMapper.insert(tradeOrderBO.getTradeOrderDeliveryDO());
             }
 
             tradeOrderBO.getTradeOrderDetailBOList().forEach(tradeOrderDetailBO -> {
-
+                tradeDetailMapper.update(new LambdaUpdateWrapper<TradeDetailDO>()
+                        .set(TradeDetailDO::getDeleted, 1)
+                        .set(TradeDetailDO::getUpdateTime,new Date())
+                        .eq(TradeDetailDO::getOrderId, tradeOrderBO.getTradeOrderDO().getId())
+                );
                 tradeDetailMapper.insertBatch(tradeOrderDetailBO.getTradeDetailDOList());
+
+
+                tradeDetailBaseMapper.update(new LambdaUpdateWrapper<TradeDetailBaseDO>()
+                        .set(TradeDetailBaseDO::getDeleted, 1)
+                        .set(TradeDetailBaseDO::getUpdateTime,new Date())
+                        .eq(TradeDetailBaseDO::getOrderId, tradeOrderBO.getTradeOrderDO().getId())
+                );
                 tradeDetailBaseMapper.insertBatch(tradeOrderDetailBO.getTradeDetailBaseDOList());
+
+
+                tradeVisitorMapper.update(new LambdaUpdateWrapper<TradeVisitorDO>()
+                        .set(TradeVisitorDO::getDeleted, 1)
+                        .set(TradeVisitorDO::getUpdateTime,new Date())
+                        .eq(TradeVisitorDO::getOrderId, tradeOrderBO.getTradeOrderDO().getId())
+                );
                 tradeVisitorMapper.insertBatch(tradeOrderDetailBO.getTradeVisitorDOList());
 
                 if(tradeOrderDetailBO.getTradeOrderHotelDO() !=null) {
+                    tradeOrderHotelMapper.update(new LambdaUpdateWrapper<TradeOrderHotelDO>()
+                            .set(TradeOrderHotelDO::getDeleted, 1)
+                            .set(TradeOrderHotelDO::getUpdateTime,new Date())
+                            .eq(TradeOrderHotelDO::getOrderId, tradeOrderBO.getTradeOrderDO().getId())
+                    );
                     tradeOrderHotelMapper.insert(tradeOrderDetailBO.getTradeOrderHotelDO());
                 }
                 if(CollUtil.isNotEmpty(tradeOrderDetailBO.getTradeDetailPriceDOList())){
+                    tradeDetailPriceMapper.update(new LambdaUpdateWrapper<TradeDetailPriceDO>()
+                            .set(TradeDetailPriceDO::getDeleted, 1)
+                            .set(TradeDetailPriceDO::getUpdateTime,new Date())
+                            .eq(TradeDetailPriceDO::getOrderId, tradeOrderBO.getTradeOrderDO().getId())
+                    );
                     tradeDetailPriceMapper.insertBatch(tradeOrderDetailBO.getTradeDetailPriceDOList());
                 }
             });

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/order/impl/TradeOrderServiceImpl.java

@@ -191,14 +191,7 @@ public class TradeOrderServiceImpl implements TradeOrderService {
             beforeOrderCreate(tradeOrderBO);
             //3.保存订单
             tradeOrderRepositoryService.saveOrder(tradeOrderBO);
-            //4.供应商下单
-//            CommonResult<TradeSupplierOrderRespBO> tradeSupplierOrderResp = tradeSupplierService.createOrder(tradeOrderBO);
-//            if (tradeSupplierOrderResp.isError()) {
-//                //4.1 供应商下单失败回调
-//                tradeSupplierCallbackService.afterAnyOrderCreateFail(tradeOrderBO.getTradeOrderDO());
-//                return CommonResult.error(tradeSupplierOrderResp);
-//            }
-            //4.2 供应商下单成功回调
+            //4下单成功回调
             tradeSupplierCallbackService.afterAllOrderCreate(tradeOrderBO.getTradeOrderDO());
             //5.下单后处理
             afterOrderCreate(tradeOrderBO);
@@ -228,7 +221,7 @@ public class TradeOrderServiceImpl implements TradeOrderService {
             beforeOrderCreate(tradeOrderBO);
             //3.保存订单
             tradeOrderRepositoryService.modifyOrder(tradeOrderBO);
-            //4.2 供应商下单成功回调
+            //4 下单成功回调
             tradeSupplierCallbackService.afterAllOrderCreate(tradeOrderBO.getTradeOrderDO());
             //5.下单后处理
             afterOrderCreate(tradeOrderBO);
@@ -238,12 +231,12 @@ public class TradeOrderServiceImpl implements TradeOrderService {
                     .setMarketingName(tradeOrderBO.getExtraInfo().getMarketingName());
             return CommonResult.success(tradeOrderRespDTO);
         } catch (ServiceException e) {
-            ExceptionUtils.log(log, "下单失败:", e);
+            ExceptionUtils.log(log, "订单修改失败:", e);
             handleAfterOrderCreateFail(e.getCode(), tradeOrderBO);
             return CommonResult.error(e);
         } catch (Exception e) {
-            log.error("下单失败：", e);
-            return CommonResult.error(ORDER_CREATE_FAIL);
+            log.error("订单修改失败：", e);
+            return CommonResult.error(ORDER_MODIFY_FAIL);
         }
     }
 
@@ -1296,14 +1289,6 @@ public class TradeOrderServiceImpl implements TradeOrderService {
         tradeOrderHandlers.forEach(handler -> handler.afterOrderCreate(tradeOrderBO));
         tradePublishUtils.publishOrderCreateSuccessMsg(tradeOrderBO.getTradeOrderDO().getId().toString());
         //支付倒计时--不超时，有预订单
-        Integer payTimeOut;
-//        if (ObjectUtil.equal(tradeOrderBO.getTradeOrderDO().getSellMethod(), SellMethodEnum.OTA.getType())) {
-//            payTimeOut = configUtils.getPayTimeOut(Long.parseLong(tradeOrderBO.getTradeOrderDO().getSourceId()));
-//        } else {
-//            payTimeOut = configUtils.getPayTimeOut();
-//        }
-//        tradePublishUtils.publishOrderPayDelayMsg(tradeOrderBO.getTradeOrderDO().getId().toString(), payTimeOut * 60000);
-        //记录订单日志
         TradeOrderLogUtils.setOrderInfo(tradeOrderBO.getTradeOrderDO().getId(), null, tradeOrderBO.getTradeOrderDO().getOrderStatus(), TradeOrderLogUtils.append("result", "成功"));
     }
 

ship-module-trade/ship-module-trade-biz/src/main/java/com/yc/ship/module/trade/service/otc/impl/OtcTradeOrderServiceImpl.java

@@ -6,6 +6,8 @@ import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
 import cn.hutool.extra.spring.SpringUtil;
 import com.alibaba.excel.util.DateUtils;
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -28,6 +30,7 @@ import com.yc.ship.module.ota.api.OtaDistributorApi;
 import com.yc.ship.module.ota.api.dto.DistributorProductRespDTO;
 import com.yc.ship.module.ota.api.dto.DistributorRespDTO;
 import com.yc.ship.module.ota.dal.dataobject.distributor.DistributorDO;
+import com.yc.ship.module.ota.dal.dataobject.otaDistributorRegion.OtaDistributorRegionDO;
 import com.yc.ship.module.ota.dal.mysql.distributor.DistributorMapper;
 import com.yc.ship.module.otc.api.agency.dto.AgencyUserLoginInfoRespDTO;
 import com.yc.ship.module.otc.api.agency.dto.CooperateRespDTO;
@@ -36,6 +39,7 @@ import com.yc.ship.module.otc.api.store.dto.StoreInfoRespDTO;
 import com.yc.ship.module.product.api.ProductApi;
 import com.yc.ship.module.product.api.dto.*;
 import com.yc.ship.module.product.controller.admin.voyage.vo.VoyageRespVO;
+import com.yc.ship.module.product.dal.dataobject.productSku.ProductSkuDO;
 import com.yc.ship.module.product.dal.dataobject.voyage.VoyageDO;
 import com.yc.ship.module.product.service.voyage.VoyageService;
 import com.yc.ship.module.resource.api.ship.ShipApi;
@@ -2420,8 +2424,6 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
         if(tradeOrderDO==null) {
             return CommonResult.error(ORDER_NOT_EXIST);
         }
-//        VoyageRespDTO voyage = productApi.getVoyage(createVO.getVoyageId());
-//        String date = DateUtils.format(new Date(),"yyyyMMddmmss");
         String orderNo = tradeOrderDO.getOrderNo();
         List<TradeOrderCountryReqVO> countryData = createVO.getCountryData();
         ShipTradeOrderCreateReqVO shipTradeOrderCreateReqVO = BeanUtils.toBean(createVO, ShipTradeOrderCreateReqVO.class);
@@ -2588,9 +2590,26 @@ public class OtcTradeOrderServiceImpl implements OtcTradeOrderService {
 
             });
         });
-        tradeOrderCountryMapper.insertOrUpdateBatch(tradeOrderCountryDOList);
-        tradeOrderRoomModelMapper.insertOrUpdateBatch(list);
-        tradeOrderFloorMapper.insertOrUpdateBatch(floorPlus);
+
+        tradeOrderCountryMapper.update(new LambdaUpdateWrapper<TradeOrderCountryDO>()
+                .set(TradeOrderCountryDO::getDeleted, 1)
+                .set(TradeOrderCountryDO::getUpdateTime,new Date())
+                .eq(TradeOrderCountryDO::getOrderId, orderId)
+        );
+        tradeOrderRoomModelMapper.update(new LambdaUpdateWrapper<TradeOrderRoomModelDO>()
+                .set(TradeOrderRoomModelDO::getDeleted, 1)
+                .set(TradeOrderRoomModelDO::getUpdateTime,new Date())
+                .eq(TradeOrderRoomModelDO::getOrderId, orderId)
+        );
+        tradeOrderFloorMapper.update(new LambdaUpdateWrapper<TradeOrderFloorDO>()
+                .set(TradeOrderFloorDO::getDeleted, 1)
+                .set(TradeOrderFloorDO::getUpdateTime,new Date())
+                .eq(TradeOrderFloorDO::getOrderId, orderId)
+        );
+
+        tradeOrderCountryMapper.insertBatch(tradeOrderCountryDOList);
+        tradeOrderRoomModelMapper.insertBatch(list);
+        tradeOrderFloorMapper.insertBatch(floorPlus);
 
         OtcTradeOrderCreateRespVO respVO = TradeOrderConvert.INSTANCE.convert(result.getData());
         return CommonResult.success(respVO);