diff --git a/cms-common/src/main/java/com/qs/serve/common/exception/UnifiedExceptionHandler.java b/cms-common/src/main/java/com/qs/serve/common/exception/UnifiedExceptionHandler.java index a9aa06b..7b463aa 100644 --- a/cms-common/src/main/java/com/qs/serve/common/exception/UnifiedExceptionHandler.java +++ b/cms-common/src/main/java/com/qs/serve/common/exception/UnifiedExceptionHandler.java @@ -38,6 +38,7 @@ public class UnifiedExceptionHandler { @ResponseBody public R handleBindException(BusinessException e,HttpServletRequest request) { log.warn("自定义异常触发【{},{}】，请求地址：{}",e.getCode(),e.getMessage(),request.getRequestURI()); + e.printStackTrace(); return new R(e.getCode(),e.getMessage()); } diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/controller/OmsOrderExpiredController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/controller/OmsOrderExpiredController.java index 3261701..ab97837 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/controller/OmsOrderExpiredController.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/controller/OmsOrderExpiredController.java @@ -4,7 +4,10 @@ import com.qs.serve.common.annotation.SysLog; import com.qs.serve.framework.base.model.R; import com.qs.serve.common.enums.BizType; import com.qs.serve.common.enums.SystemModule; +import com.qs.serve.modules.oms.entity.OmsOrder; import com.qs.serve.modules.oms.service.OmsOrderOptionsService; +import com.qs.serve.modules.oms.service.OmsOrderService; +import com.qs.serve.modules.tbs.entity.bo.TbsAffairCommitBo; import lombok.AllArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.web.bind.annotation.*; @@ -20,6 +23,7 @@ import org.springframework.web.bind.annotation.*; public class OmsOrderExpiredController { OmsOrderOptionsService omsOrderOptionsService; + OmsOrderService omsOrderService; /** * 提交临期订单 @@ -33,6 +37,18 @@ public class OmsOrderExpiredController { return R.ok(); } + @GetMapping("successDev/{id}") + public R successDev(@PathVariable String id){ + OmsOrder order = omsOrderService.getById( id); + if(!order.getOrderSn().contains("TEST")){ + return R.error("非测试环境"); + } + TbsAffairCommitBo affairCommit = new TbsAffairCommitBo(id); + omsOrderOptionsService.doFinished(affairCommit); + omsOrderOptionsService.syncToErp(); + return R.ok(); + } + @GetMapping("compensate/{id}") public R runCompensate(@PathVariable String id){ omsOrderOptionsService.runCompensate(id); diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderOptionsServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderOptionsServiceImpl.java index 264a14e..2bc4049 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderOptionsServiceImpl.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderOptionsServiceImpl.java @@ -114,7 +114,7 @@ public class OmsOrderOptionsServiceImpl implements OmsOrderOptionsService { List orderItemList = omsOrderItemService.listByOrderId(Long.parseLong(orderId)); // 加成订单项合法性 - OmsOrderUtil.checkOrderItemValues(orderItemList); + OmsOrderUtil.checkOrderItemValues(orderItemList,omsOrder.getOrderType()); //下单前规则拦截 //GoodsCategoryRule categoryRule = goodsCategoryRuleMapper.selectById(omsOrder.getBrandRuleId()); diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java index fb461f7..fcc60e0 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/impl/OmsOrderServiceImpl.java @@ -1085,7 +1085,7 @@ public class OmsOrderServiceImpl extends ServiceImpl i List orderItemList = omsOrderItemService.list(iteLqw); // 加成订单项合法性 - OmsOrderUtil.checkOrderItemValues(orderItemList); + OmsOrderUtil.checkOrderItemValues(orderItemList,omsOrder.getOrderType()); //下单前规则拦截 GoodsCategoryRule categoryRule = goodsCategoryRuleMapper.selectById(omsOrder.getBrandRuleId()); diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderServiceImpl.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderServiceImpl.java index 2692d36..7b78692 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderServiceImpl.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderServiceImpl.java @@ -1244,9 +1244,9 @@ public class OmsSaleOrderServiceImpl extends ServiceImpl skuIds = imminentBatches.stream() .map(GoodsImminentBatch::getSkuId).collect(Collectors.toSet()); - if (skuIds.size() != imminentBatches.size()) { - Assert.throwEx("不同批次相同产品，请分开下单"); - } +// if (skuIds.size() != imminentBatches.size()) { +// Assert.throwEx("不同批次相同产品，请分开下单"); +// } List goodsSkuList = goodsSkuService.listByIds(skuIds); diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/utils/OmsOrderUtil.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/utils/OmsOrderUtil.java index 52cf82e..160fdf3 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/utils/OmsOrderUtil.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/oms/utils/OmsOrderUtil.java @@ -15,7 +15,7 @@ import java.util.List; @UtilityClass public class OmsOrderUtil { - public static void checkOrderItemValues(List orderItemList) { + public static void checkOrderItemValues(List orderItemList,int orderType) { if (orderItemList.size() < 1) { Assert.throwEx("空项目不支持下单"); } @@ -26,7 +26,8 @@ public class OmsOrderUtil { } //拦截相同的skuItem long countDistinct = orderItemList.stream().map(OmsOrderItem::getSkuId).distinct().count(); - if (orderItemList.size() != countDistinct) { + // 忽略临期品 + if (orderItemList.size() != countDistinct && orderType!= 3) { Assert.throwEx("有重复存货，请检查订单项"); } for (OmsOrderItem orderItem : orderItemList) { diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/third/PortalOfCostController.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/third/PortalOfCostController.java index 8f39722..9d8bc0e 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/third/PortalOfCostController.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/third/PortalOfCostController.java @@ -52,6 +52,8 @@ public class PortalOfCostController { private TbsCostApplyMapper tbsCostApplyMapper; private SysDeleteLogService deleteLogService; + + /** * 删除DHX费用(调度系统调用的) * @param param diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/third/entity/OrderGiftCreateCostParam.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/third/entity/OrderGiftCreateCostParam.java new file mode 100644 index 0000000..c02f3fd --- /dev/null +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/third/entity/OrderGiftCreateCostParam.java @@ -0,0 +1,35 @@ +package com.qs.serve.modules.third.entity; + +import lombok.Data; + +/** + * 搭赠生成费用参数 + * @author YenHex + * @since 2025/7/18 + */ +@Data +public class OrderGiftCreateCostParam { + + /** + * 源主订单号 + */ + private String orgOrderSn; + + /** + * 搭赠订单单号 + */ + private String orderSn; + + /** + * 供应商或客户ID + */ + private String supplierId; + + /** + * 科目编码 + */ + private String subjectCode; + + private String rere; + +} diff --git a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/third/service/PortalOfCostPartApplication.java b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/third/service/PortalOfCostPartApplication.java index 08d48d5..57d1802 100644 --- a/cms-modules/cms-system/src/main/java/com/qs/serve/modules/third/service/PortalOfCostPartApplication.java +++ b/cms-modules/cms-system/src/main/java/com/qs/serve/modules/third/service/PortalOfCostPartApplication.java @@ -87,6 +87,8 @@ public class PortalOfCostPartApplication { private ProjectApisProperties projectApisProperties; private PayPaymentService payPaymentService; + + /** * 协议类费用 释放接口，释放合同不再支付的金额； * @param paymentBo