Merge remote-tracking branch 'origin/test' into test

cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkConsumeDiscountServiceImpl.java

@@ -52,7 +52,7 @@ public class MkConsumeDiscountServiceImpl extends ServiceImpl<MkConsumeDiscountM
             throw new ApiNotPrintException("优惠金额和随机优惠金额不能同时为空");
         }
         MkConsumeDiscount consumeDiscount = getOne(new QueryWrapper().eq(MkConsumeDiscount::getShopId, shopId));
-
+        BeanUtil.copyProperties(consumeDiscountDTO, consumeDiscount);
         if (TableValueConstant.ConsumeDiscount.DiscountType.RANDOM.getCode().equals(consumeDiscountDTO.getDiscountType())) {
             if (consumeDiscountDTO.getRandomDiscountList() == null || consumeDiscountDTO.getRandomDiscountList().isEmpty()) {
                 throw new ApiNotPrintException("随机优惠金额不能为空");
@@ -72,7 +72,6 @@ public class MkConsumeDiscountServiceImpl extends ServiceImpl<MkConsumeDiscountM
             }
         }
 
-        BeanUtil.copyProperties(consumeDiscountDTO, consumeDiscount);
 
 
         if (consumeDiscountDTO.getUseTypeList() != null) {