opt: 订单相关调整；fix:预算统计显示异常

src/main/java/com/qs/serve/modules/oms/entity/OmsSaleOrder.java

@@ -32,6 +32,9 @@ public class OmsSaleOrder implements Serializable {
     @TableId(type = IdType.AUTO)
     private Long id;
 
+    /** 订单在erp的id */
+    private Long orderErpId;
+
     /** 订单号 */
     @NotBlank(message = "订单号不能为空")
     @Length(max = 20,message = "订单号长度不能超过20字")
@@ -136,7 +139,6 @@ public class OmsSaleOrder implements Serializable {
      * 0->草稿；
      * 1->已确认下单
      * 2->同步到调度系统
-     * 2->已确认(已生成报价单);
      * 6->已取消
      **/
     private Integer status;

src/main/java/com/qs/serve/modules/oms/listener/OrderCreateCacheListener.java

@@ -41,30 +41,8 @@ public class OrderCreateCacheListener {
         AuthContextUtils.setTenant("001");
         // 1.查询订单信息
         OmsSaleOrder omsSaleOrder = omsSaleOrderService.getById(event.getOrderId());
-        // 2.查询订单明细
-        List<OmsSaleOrderItem> orderItemList = omsSaleOrderItemService.listByOrderId(omsSaleOrder.getId());
         // 3.保存到ERP订单
-//        ErpSaleOrder erpSaleOrder = CopierUtil.copy(omsSaleOrder, new ErpSaleOrder());
-//        erpSaleOrder.setOrderSource("CMS");
-//        erpSaleOrder.setCurrency("人民币");
-//        erpSaleOrder.setExchangeRate(1);
-//        erpSaleOrder.setErpStatus(0);
-//        erpSaleOrder.setVersion("1");
-//        long rs = erpSaleOrderMapper.insert(erpSaleOrder);
-//        if (rs==0) {
-//            return;
-//        }
-//        for (OmsSaleOrderItem orderItem : orderItemList) {
-//            ErpSaleOrderItem erpSaleOrderItem = CopierUtil.copy(orderItem, new ErpSaleOrderItem());
-//            erpSaleOrderItem.setVersion("1");
-//            erpSaleOrderItemMapper.insert(erpSaleOrderItem);
-//        }
-        omsSaleOrder.setOrderSource("");
-        omsSaleOrder.setCurrency("人民币");
-        omsSaleOrder.setExchangeRate(1);
-        omsSaleOrder.setVersion("1");
         omsSaleOrder.setStatus(2);
-        omsSaleOrderService.updateById(omsSaleOrder);
     }
 
 

src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderPart1ServiceImpl.java

@@ -78,7 +78,6 @@ public class OmsSaleOrderPart1ServiceImpl implements OmsSaleOrderPart1Service {
         List<OmsSaleOrderItem> orderItems = omsSaleOrderItemService.list(new LambdaQueryWrapper<OmsSaleOrderItem>()
                 .eq(OmsSaleOrderItem::getOrderId, orderId));
         OmsSaleOrder order = new OmsSaleOrder();
-        order.setId(null);
         order.setOrderType(orgOrder.getOrderType());
         String orderPrefix = null;
         if (order.getOrderType().equals(0)) {
@@ -94,6 +93,10 @@ public class OmsSaleOrderPart1ServiceImpl implements OmsSaleOrderPart1Service {
         }
         order.setOrderSn(orderPrefix + CodeGenUtil.generate(CodeGenUtil.SourceKey.OmsOrder));
         SysUser user = sysUserService.getById(AuthContextUtils.getSysUserId());
+        order.setOrderSource("CMS");
+        order.setCurrency("人民币");
+        order.setExchangeRate(1);
+        order.setVersion("cms");
         order.setUserId(user.getId());
         order.setUserCode(user.getCode());
         order.setUserName(user.getName());

src/main/java/com/qs/serve/modules/oms/service/impl/OmsSaleOrderServiceImpl.java

@@ -590,6 +590,7 @@ public class OmsSaleOrderServiceImpl extends ServiceImpl<OmsSaleOrderMapper, Oms
         order.setUserName(user.getName());
         order.setUserCode(user.getCode());
         order.setUserPhone(user.getMobile());
+        order.setVersion("cms");
 
         this.appendCusRegion(supplier, order);
 
@@ -869,9 +870,8 @@ public class OmsSaleOrderServiceImpl extends ServiceImpl<OmsSaleOrderMapper, Oms
             }
         } else {
             order = new OmsSaleOrder();
-            order.setOrderSn("SSP" + CodeGenUtil.generate(CodeGenUtil.SourceKey.OmsOrder));
+            order.setOrderSn("SP" + CodeGenUtil.generate(CodeGenUtil.SourceKey.OmsOrder));
         }
-        order.setLatitudeFrom("sp");
         order.setCdOrderRemark(param.getCdOrderRemark());
         order.setOaRateId(param.getOaRateId());
         BigDecimal discountRate = baseMapper.getExpiredOrderRates(param.getOaRateId());

src/main/java/com/qs/serve/modules/tbs/common/util/TbsBudgetConditionUtil.java

@@ -2,6 +2,7 @@ package com.qs.serve.modules.tbs.common.util;
 
 import com.qs.serve.common.util.CollectionUtil;
 import com.qs.serve.common.util.SpringUtils;
+import com.qs.serve.common.util.StringUtils;
 import com.qs.serve.modules.goods.entity.GoodsCategory;
 import com.qs.serve.modules.goods.entity.GoodsSku;
 import com.qs.serve.modules.goods.entity.GoodsSpu;
@@ -46,6 +47,7 @@ public class TbsBudgetConditionUtil {
                 GoodsCategory category3 = goodsCategoryService.getById(goodsSpu.getCategoryThird());
                 TbsBudgetCondition condition = new TbsBudgetCondition();
                 condition.setBudgetId(budgetId);
+                condition.setBrandId(category1.getId()+"");
                 condition.setTargetType(TbsGoodsType.sku.name());
                 condition.setTargetId(sku.getId());
                 condition.setTargetCode(sku.getSkuCode());
@@ -64,6 +66,7 @@ public class TbsBudgetConditionUtil {
                 TbsBudgetCondition condition = new TbsBudgetCondition();
                 condition.setBudgetId(budgetId);
                 condition.setTargetType(TbsGoodsType.spu.name());
+                condition.setBrandId(category1.getId()+"");
                 condition.setTargetId(goodsSpu.getId());
                 condition.setTargetCode(goodsSpu.getSpuCode());
                 condition.setTargetName(goodsSpu.getName());
@@ -99,6 +102,9 @@ public class TbsBudgetConditionUtil {
                 condition.setTargetName(category.getName());
                 condition.setTargetLevelPathIds(category.getLevelPath());
                 condition.setTargetLevelPathNames(category.getLevelPathNames());
+                if(StringUtils.hasText(category.getLevelPath())){
+                    condition.setBrandId(category.getLevelPath().split("_")[0]);
+                }
                 budgetConditions.add(condition);
             }
         }

src/main/java/com/qs/serve/modules/third/PortalGoodsController.java

@@ -1,5 +1,6 @@
 package com.qs.serve.modules.third;
 
+import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.qs.serve.common.model.dto.R;
 import com.qs.serve.common.util.Assert;
@@ -69,6 +70,9 @@ public class PortalGoodsController {
         List<Long> spuIds = skuList.stream().filter(a->a.getSpecialFlag()!=1)
                 .map(a->a.getSpuId()).collect(Collectors.toList());
 
+        if(CollUtil.isEmpty(spuIds)){
+            Assert.throwEx("没有找到对应商品");
+        }
         LambdaQueryWrapper<GoodsSpu> spuLqw = new LambdaQueryWrapper<>();
         spuLqw.eq(GoodsSpu::getOrderFlag,1);
         spuLqw.eq(GoodsSpu::getShelf,1);