调整

src/main/java/com/qs/serve/modules/goods/service/impl/GoodsSkuServiceImpl.java

@@ -237,6 +237,20 @@ public class GoodsSkuServiceImpl extends ServiceImpl<GoodsSkuMapper,GoodsSku> im
                 Assert.throwEx("数据不存在");
             }
         }
+        if(goodSkuVo.getOrderFlag()==1){
+            LambdaQueryWrapper<GoodsSku> skuCheckLqw = new LambdaQueryWrapper<>();
+            if(dbGoodSku!=null){
+                skuCheckLqw.ne(GoodsSku::getId,dbGoodSku.getId());
+            }
+            skuCheckLqw.eq(GoodsSku::getSpuId,goodSkuVo.getSkuId());
+            skuCheckLqw.eq(GoodsSku::getBelong,goodSkuVo.getBelong());
+            skuCheckLqw.eq(GoodsSku::getOrderFlag,1);
+            if(this.count(skuCheckLqw)>0){
+                Assert.throwEx("下单的产地需唯一");
+            }
+        }
+
+
         GoodsSku goodsSku = CopierUtil.copy(goodSkuVo,new GoodsSku());
         if(dbGoodSku!=null){
             if(goodsSku.getSpuId()!=null&&!goodsSku.getSpuId().equals(dbGoodSku.getSpuId())){
@@ -244,6 +258,7 @@ public class GoodsSkuServiceImpl extends ServiceImpl<GoodsSkuMapper,GoodsSku> im
             }
             goodsSku.setId(dbGoodSku.getId());
         }
+
         if(goodSkuVo.getSpecValueIds()!=null){
             if(goodSkuVo.getSpecValueIds().size()!= GoodsConst.SPEC_COUNT){
                 Assert.throwEx("规格值数量缺失");

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

@@ -188,9 +188,9 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper,OmsOrder> im
         //todo 计算供应商折扣
         //todo 计算是否有活动优惠
         //收货地址
-        BmsSupplierAddress supplierAddress;
+        BmsSupplierAddress supplierAddress = null;
         if(confirmOrder.getAddressId()==null){
-            supplierAddress = bmsSupplierAddressService.getDefault(Long.parseLong(supplier.getId()));
+            //supplierAddress = bmsSupplierAddressService.getDefault(Long.parseLong(supplier.getId()));
         }else if (confirmOrder.getAddressId().equals(0L)){
             supplierAddress = new BmsSupplierAddress();
             supplierAddress.setId(0L);
@@ -343,9 +343,9 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper,OmsOrder> im
         SysUser user = sysUserService.getById(AuthContextUtils.getSysUserId());
         BmsSupplier supplier = confirmOrder.getSupplier();
         BmsSupplierAddress address = confirmOrder.getDefaultAddress();
-        if(address==null){
+//        if(address==null){
-            Assert.throwEx("请补充收货地址");
+//            Assert.throwEx("请补充收货地址");
-        }
+//        }
         List<OmsShoppingCart> shoppingCarts = confirmOrder.getShoppingCarts();
         OmsOrder order = new OmsOrder();
         order.setLatitudeFrom(confirmOrder.getLatitudeFrom().toLowerCase(Locale.ROOT));

src/main/java/com/qs/serve/modules/tbs/mapper/TbsScheduleItemBudgetMapper.java

@@ -40,6 +40,7 @@ public interface TbsScheduleItemBudgetMapper extends BaseMapper<TbsScheduleItemB
      * @param applyId
      * @return
      */
+    @InterceptorIgnore(tenantLine = "true")
     List<TbsScheduleItemBudgetAmount> totalApplyAmountList(@Param("sibIdList")List<Long> scheduleItemBudgetIds,
                                                            @Param("applyId")Long applyId);
 
@@ -65,6 +66,7 @@ public interface TbsScheduleItemBudgetMapper extends BaseMapper<TbsScheduleItemB
      * @param policyId
      * @return
      */
+    @InterceptorIgnore(tenantLine = "true")
     List<TbsScheduleItemBudgetAmount> totalPolicyAmountList(@Param("sibIdList")List<Long> scheduleItemBudgetIds,
                                                            @Param("policyId")Long policyId);
 
@@ -105,6 +107,7 @@ public interface TbsScheduleItemBudgetMapper extends BaseMapper<TbsScheduleItemB
      * @return
      * 用于替代 totalCostAmountByApplyId()
      */
+    @InterceptorIgnore(tenantLine = "true")
     List<TbsBudgetLogPreAmount> listLogCostAmount(@Param("budgetIds") List<Long> budgetIds,
                                                   @Param("scheduleItemIds") List<Long>  scheduleItemIds,
                                                   @Param("applyId") Long applyId);
@@ -118,6 +121,7 @@ public interface TbsScheduleItemBudgetMapper extends BaseMapper<TbsScheduleItemB
      * @return
      * 用于替代 totalCostAmountByApplyId()
      */
+    @InterceptorIgnore(tenantLine = "true")
     List<TbsBudgetLogPreAmount> listLogCostAmountWithPolicy(@Param("budgetIds") List<Long> budgetIds,
                                                   @Param("scheduleItemIds") List<Long>  scheduleItemIds,
                                                   @Param("policyId") Long policyId);
@@ -130,6 +134,7 @@ public interface TbsScheduleItemBudgetMapper extends BaseMapper<TbsScheduleItemB
      * @param policyId 政策申请id(防止驳回后提交重复扣除)
      * @return
      */
+    @InterceptorIgnore(tenantLine = "true")
     @Select("SELECT  sum( amount )  FROM  `tbs_budget_log` " +
             " LEFT JOIN   `tzc_policy` " +
             "   ON `tbs_budget_log`.policy_id = tzc_policy.id " +
@@ -143,7 +148,7 @@ public interface TbsScheduleItemBudgetMapper extends BaseMapper<TbsScheduleItemB
                                         @Param("policyId") Long policyId);
 
 
-
+    @InterceptorIgnore(tenantLine = "true")
     Long findUnMatchScheduleItemBySourceBudgetIdAndTargetBudgetId(@Param("sourceId")Long sourceId, @Param("targetId")Long targetId);
 
     /**
@@ -152,6 +157,7 @@ public interface TbsScheduleItemBudgetMapper extends BaseMapper<TbsScheduleItemB
      * @param optNumbers 包含
      * @return
      */
+    @InterceptorIgnore(tenantLine = "true")
     List<TbsBudgetLogWithAmount> getSumAmtInList(@Param("selectIds") List<Long> ids,@Param("optNumbers")List<Integer> optNumbers);
 
 
@@ -161,6 +167,7 @@ public interface TbsScheduleItemBudgetMapper extends BaseMapper<TbsScheduleItemB
      * @param optNumbers 不包含
      * @return
      */
+    @InterceptorIgnore(tenantLine = "true")
     List<TbsBudgetLogWithAmount> getSumAmtNotInList(@Param("selectIds") List<Long> ids,@Param("optNumbers")List<Integer> optNumbers);
 
     /**
@@ -169,6 +176,7 @@ public interface TbsScheduleItemBudgetMapper extends BaseMapper<TbsScheduleItemB
      * @param optNumbers
      * @return
      */
+    @InterceptorIgnore(tenantLine = "true")
     List<TbsBudgetLogWithAmount> getCostCheckingList(@Param("selectIds") List<Long> ids,@Param("optNumbers")List<Integer> optNumbers);
 
     /**
@@ -177,6 +185,7 @@ public interface TbsScheduleItemBudgetMapper extends BaseMapper<TbsScheduleItemB
      * @param optNumbers
      * @return
      */
+    @InterceptorIgnore(tenantLine = "true")
     List<TbsBudgetLogWithAmount> getPolicyCheckingList(@Param("selectIds") List<Long> ids,@Param("optNumbers")List<Integer> optNumbers);
 
     @InterceptorIgnore(tenantLine = "true")

src/main/java/com/qs/serve/modules/tbs/service/impl/TbsScheduleItemBudgetServiceImpl.java

@@ -67,7 +67,7 @@ public class TbsScheduleItemBudgetServiceImpl extends ServiceImpl<TbsScheduleIte
 
         List<TbsBudgetLogWithAmount> policyCheckingList = baseMapper.getPolicyCheckingList(scheduleItemBudgetIds, BudgetLogOptFlag.finalPolicyOptFlag);
 
-        List<TbsBudgetLogWithAmount> costCheckingList = baseMapper.getCostCheckingList(scheduleItemBudgetIds, BudgetLogOptFlag.finalPolicyOptFlag);
+        List<TbsBudgetLogWithAmount> costCheckingList = baseMapper.getCostCheckingList(scheduleItemBudgetIds, BudgetLogOptFlag.finalCostOptFlag);
 
         List<TbsBudgetScheduleWithAmount> result = new ArrayList<>();
 

src/main/resources/mapper/goods/GoodsSkuMapper.xml

@@ -58,6 +58,7 @@
         goods_sku.`cost_flag`,
         goods_sku.`update_by`,
         goods_sku.`special_flag`,
+        goods_sku.`order_flag`,
         goods_sku.`belong`
     </sql>