Merge branch 'dev_6.8.4_order' into test6.8.4

@@ -298,6 +298,7 @@ public class SellerOrderController {
 
     /**
      * 批量调价
+     * 涉及不同批次，需要保证金的扣费比例保持一致，若比例存在不一致，则会导致保证金账户错误
      * @param uid
      * @param storage_id
      * @param old_price

@@ -80,7 +80,7 @@ public abstract class AbstractSellerAdjustPriceTaskHandler extends AbstractSelle
         @Override
         public Integer call() throws Exception {
             try {
-                log.info("[{}-{}-{}] handle before sellerOrder:{},\nbefore sellerOrderGoods:{},\nafter earnestMoney:{},after income:{}",
+                log.info("[{}-{}-{}] handle before sellerOrder:{},before sellerOrderGoods:{},after earnestMoney:{},after income:{}",
                         uid, taskId, skupDto.getSkup(),
                         skupDto.getSellerOrder(),
                         skupDto.getSellerOrderGoods(),
@@ -99,7 +99,6 @@ public abstract class AbstractSellerAdjustPriceTaskHandler extends AbstractSelle
 
     @Transactional
     @Component
-    @Database(ForceMaster=true, DataSource="ufo_order")
     public static class SkupAdjustPriceDBService {
 
         @Autowired
@@ -115,8 +114,8 @@ public abstract class AbstractSellerAdjustPriceTaskHandler extends AbstractSelle
         private SellerTaskDetailMapper sellerTaskDetailMapper;
 
         @Transactional
+        @Database(ForceMaster=true, DataSource="ufo_order")
         public void update(long taskId, BigDecimal newPrice, BigDecimal diffEarnestMoney, SellerOrderComputeResult computeResult, SkupDto skupDto) {
-
             SellerOrderGoods sellerOrderGoods = skupDto.getSellerOrderGoods();
             List<Integer> skups = Lists.newArrayList(sellerOrderGoods.getId());
             //sell_order_goods(价格)

@@ -181,7 +181,7 @@ public class SellerDownShelfTaskHandler extends AbstractSellerTaskHandler<Map<In
         @Override
         public Integer call() throws Exception {
             try {
-                log.info("[{}-{}-{}] handle sellerOrderGoods:{}", uid, taskId, skupDto.getSkup(), skupDto.getSellerOrderGoods());
+                log.info("[{}-{}-{}] handle sellerOrder:{},sellerOrderGoods:{}", uid, taskId, skupDto.getSkup(), skupDto.getSellerOrder(), skupDto.getSellerOrderGoods());
                 skupDownShelfDBService.update(taskId, skupDto);
                 log.info("[{}-{}-{}] handle success", uid, taskId, skupDto.getSkup());
                 return skupDto.getSkup();
@@ -194,7 +194,6 @@ public class SellerDownShelfTaskHandler extends AbstractSellerTaskHandler<Map<In
 
     @Transactional
     @Component
-    @Database(ForceMaster=true, DataSource="ufo_order")
     public static class SkupDownShelfDBService {
         @Autowired
         private SellerOrderMapper sellerOrderMapper;
@@ -204,6 +203,7 @@ public class SellerDownShelfTaskHandler extends AbstractSellerTaskHandler<Map<In
         private SellerTaskDetailMapper sellerTaskDetailMapper;
 
         @Transactional
+        @Database(ForceMaster = true, DataSource = "ufo_order")
         public void update(long taskId, SkupDto skupDto) {
             SellerOrderGoods sellerOrderGoods = skupDto.getSellerOrderGoods();
 

@@ -54,7 +54,7 @@ public class SellerIncrPriceTaskHandler extends AbstractSellerAdjustPriceTaskHan
         log.info("[{}-{}] pre use total earnest:{},diff earnest:{},num:{},super:{}", uid, taskId, totalDiffMoney, diffEarnestMoney, skupDtoMap.size(), cppDto.isSuper());
         SellerWallet sellerWallet = cppDto.isSuper() ? new SellerWallet() : merchantOrderPaymentService.changePriceUseEarnest(uid, totalDiffMoney, moai);
         result.sellerWallet = sellerWallet;
-        log.info("[{}-{}] pre use total earnest result:{}",sellerWallet);
+        log.info("[{}-{}] pre use total earnest result:{}", uid, taskId, sellerWallet);
         return Objects.nonNull(sellerWallet);
     }