Merge branch 'master' of codeup.aliyun.com:64d9c5feeceb191898f636d7/honor-dd-light-ds-java into ljl-dsPurchaseOrder

ms-biz/src/main/java/com/ms/api/service/impl/OpOrderPhaseServiceImpl.java

@@ -72,7 +72,7 @@ public class OpOrderPhaseServiceImpl implements OpOrderPhaseService{
         if (ObjectUtil.isEmpty(rows)) {
             return new HashMap<>();
         }
-        return rows.stream().collect(Collectors.toMap(OpOrderPhase::getOrderId, x->x));
+        return rows.stream().collect(Collectors.toMap(OpOrderPhase::getOrderId, x->x,(v1,v2)->v1));
     }
     
 }

ms-biz/src/main/java/com/ms/api/service/impl/OpOrderRedpackInfoServiceImpl.java

@@ -73,7 +73,7 @@ public class OpOrderRedpackInfoServiceImpl implements OpOrderRedpackInfoService{
         if (ObjectUtil.isEmpty(rows)) {
             return new HashMap<>();
         }
-        return rows.stream().collect(Collectors.toMap(OpOrderRedpackInfo::getOrderId,x->x));
+        return rows.stream().collect(Collectors.toMap(OpOrderRedpackInfo::getOrderId,x->x,(v1,v2)->v1));
     }
 
     @Override

ms-biz/src/main/java/com/ms/api/service/impl/OpOrderServiceImpl.java

@@ -99,6 +99,7 @@ import com.ms.dal.entity.OpOrderPhase;
 import com.ms.dal.entity.OpOrderPriceProtection;
 import com.ms.dal.entity.OpOrderRsyncInfo;
 import com.ms.dal.entity.OpOrderRsyncLog;
+import com.ms.dal.entity.OpOrderRsyncPageBuffer;
 import com.ms.dal.entity.OpOrderRsyncPageLog;
 import com.ms.dal.entity.OpOrderRsyncPageQueue;
 import com.ms.dal.entity.OpOrderRsyncQueue;
@@ -960,7 +961,7 @@ public class OpOrderServiceImpl implements OpOrderService {
             afterSaleData.setGmtCreate(new Date());
             afterSaleDatas.add(afterSaleData);
 
-            Map<String, OpOrderChild> childs = childInfoDatas.stream().collect(Collectors.toMap(OpOrderChild::getChildOrderId, x -> x));
+            Map<String, OpOrderChild> childs = childInfoDatas.stream().collect(Collectors.toMap(OpOrderChild::getChildOrderId, x -> x,(v1,v2)->v1));
             if (ObjectUtil.isNotEmpty(skuOrder.getMasterSkuOrderIdList())) {
                 for (String masterSkuOrderId : skuOrder.getMasterSkuOrderIdList()) {
                     OpOrderGivenProduct item = new OpOrderGivenProduct();
@@ -1987,11 +1988,79 @@ public class OpOrderServiceImpl implements OpOrderService {
     @Override
     public void moveOpPageBufferToQueue(Map<Long, Long> shopIdAndMoveCntMap) {
         log.info("start moveOpPageBufferToQueue");
-        int startBufferId = 0;
+        Long startBufferId = 0L;
         int limit = 1000;
-        for (Map.Entry<Long, Long> entry : shopIdAndMoveCntMap.entrySet()) {
+        while (shopIdAndMoveCntMap.size() > 0) {
+            List<OpOrderRsyncPageBuffer> chunkBufferList = opOrderRsyncPageBufferMapper.selectByBufferIdAndLimit(startBufferId, limit);
+            if (ObjectUtil.isEmpty(chunkBufferList)) {
+                break;
+            }
+            startBufferId = chunkBufferList.stream().map(OpOrderRsyncPageBuffer::getOpOrderRsyncPageBufferId).max(Long::compare).orElse(0L);
+            startMoveOpPageBufferToQueue(chunkBufferList, shopIdAndMoveCntMap);
+            shopIdAndMoveCntMap = shopIdAndMoveCntMap.entrySet().stream().filter(r -> r.getValue() > 0)
+                .collect(Collectors.toMap(Map.Entry::getKey, Map.Entry::getValue,(v1,v2)->v1));
+        }
+        log.info("end moveOpPageBufferToQueue");
+    }
+
+    private ApiResult startMoveOpPageBufferToQueue(List<OpOrderRsyncPageBuffer> bufferList, Map<Long, Long> shopIdAndMoveCntMap) {
+        List<Long> deleteBufferIds = new ArrayList<>();
+        List<OpOrderRsyncPageQueue> insertQueueList = new ArrayList<>();
+        List<Long> deleteShopIds = new ArrayList<>();
+        for (OpOrderRsyncPageBuffer buffer : bufferList) {
+            Long shopId = buffer.getShopId();
+            if (!shopIdAndMoveCntMap.containsKey(shopId) || shopIdAndMoveCntMap.get(shopId) < 0) {
+                continue;
+            }
+            Long cnt = shopIdAndMoveCntMap.get(shopId) - 1;
+            if (cnt < 0) {
+                deleteShopIds.add(shopId);
+            }
+            OpOrderRsyncPageQueue queue = new OpOrderRsyncPageQueue();
+            queue.setOpOrderRsyncQueueId(buffer.getOpOrderRsyncQueueId());
+            queue.setShopId(shopId);
+            queue.setGmtStartModified(buffer.getGmtStartModified());
+            queue.setGmtEndModified(buffer.getGmtEndModified());
+            queue.setPageSize(buffer.getPageSize());
+            queue.setPage(buffer.getPage());
+            queue.setPageCount(buffer.getPageCount());
+            queue.setPreviewTotal(buffer.getPreviewTotal());
+            queue.setLocked(0L);
+            queue.setGmtCreate(new Date());
+            queue.setGmtModified(new Date());
+            insertQueueList.add(queue);
+            deleteBufferIds.add(buffer.getOpOrderRsyncPageBufferId());
+        }
+        for (Long id : deleteShopIds) {
+            shopIdAndMoveCntMap.remove(id);
+        }
+        Long startQueueId = null;
+        TransactionStatus transactionStatus = dataSourceTransactionManager.getTransaction(transactionDefinition);
+        try {
+            if (ObjectUtil.isNotEmpty(insertQueueList)) {
+                opOrderRsyncPageQueueMapper.insertBatch(insertQueueList);
+                startQueueId = insertQueueList.get(insertQueueList.size() - 1).getOpOrderRsyncPageQueueId();
+            }
+            if (ObjectUtil.isNotEmpty(deleteBufferIds)) {
+                opOrderRsyncPageBufferMapper.deleteByIdList(deleteBufferIds);
+            }
 
+            dataSourceTransactionManager.commit(transactionStatus);     //手动提交
+        } catch (Exception e) {
+            dataSourceTransactionManager.rollback(transactionStatus);       //事务回滚
+            return ApiResult.fail("数据处理失败，进行回滚。");
         }
+        if (ObjectUtil.isNotNull(startQueueId)) {
+            int queueCount = insertQueueList.size();
+            int queueIdLoop = 0;
+            for (Long queueId = startQueueId; queueId < (queueCount + startQueueId); queueId++) {
+                OpOrderRsyncPageQueue queueData = insertQueueList.get(queueIdLoop);
+                String queueRedisKey = RedisKeyConst.getQueueRedisKey(TblConst.op_order_rsync_page_queue, false);
+                redisTemplate.opsForList().leftPush(queueRedisKey, queueId.toString());
+                queueIdLoop++;
+            }
+        }
+        return ApiResult.ok();
     }
 
     private void doCheckRsyncOpEnd(Long shopId, Long queueId) {

ms-biz/src/main/java/com/ms/api/service/impl/OrderPrintServiceImpl.java

@@ -152,7 +152,7 @@ public class OrderPrintServiceImpl implements OrderPrintService {
         if (ObjectUtil.isEmpty(rows)) {
             return new HashMap<>();
         }
-        return rows.stream().collect(Collectors.toMap(OpOrderExt::getOrderId, x -> x));
+        return rows.stream().collect(Collectors.toMap(OpOrderExt::getOrderId, x -> x,(v1,v2)->v1));
     }
 
     @Override
@@ -173,7 +173,7 @@ public class OrderPrintServiceImpl implements OrderPrintService {
         if (ObjectUtil.isEmpty(rows)) {
             return new HashMap<>();
         }
-        return rows.stream().collect(Collectors.toMap(OpOrderSensitive::getOrderId, x -> x));
+        return rows.stream().collect(Collectors.toMap(OpOrderSensitive::getOrderId, x -> x,(v1,v2)->v1));
     }
 
     @Override
@@ -309,12 +309,12 @@ public class OrderPrintServiceImpl implements OrderPrintService {
     @Override
     public Map<String, Integer> getDdLogisticsNameAndLogisticsIdMap() {
         List<OpLogisticsPlatformBO> list = opLogisticsPlatformMapper.getDdLogisticsListByCompanyIds(null, AppConst.appPlatformDd);
-        return list.stream().collect(Collectors.toMap(OpLogisticsPlatformBO::getLogisticsName, OpLogisticsPlatformBO::getCompanyId));
+        return list.stream().collect(Collectors.toMap(OpLogisticsPlatformBO::getLogisticsName, OpLogisticsPlatformBO::getCompanyId,(v1,v2)->v1));
     }
 
     public Map<String, Integer> getDdLogisticsCompanyCodeAndCompanyIdMapFromDb() {
         List<OpLogisticsPlatformBO> list = opLogisticsPlatformMapper.getDdLogisticsListByCompanyIds(null, AppConst.appPlatformDd);
-        return list.stream().collect(Collectors.toMap(OpLogisticsPlatformBO::getCompanyCode, OpLogisticsPlatformBO::getCompanyId));
+        return list.stream().collect(Collectors.toMap(OpLogisticsPlatformBO::getCompanyCode, OpLogisticsPlatformBO::getCompanyId,(v1,v2)->v1));
     }
 
     @Override
@@ -352,7 +352,7 @@ public class OrderPrintServiceImpl implements OrderPrintService {
             return new HashMap<>();
         }
         List<OpOrderChildAfterSale> orderChildList = opOrderChildAfterSaleMapper.seteltByChildOrderIds(childOrderIds);
-        return orderChildList.stream().collect(Collectors.toMap(OpOrderChildAfterSale::getChildOrderId, x -> x));
+        return orderChildList.stream().collect(Collectors.toMap(OpOrderChildAfterSale::getChildOrderId, x -> x,(v1,v2)->v1));
     }
 
     public Map<String, String> getProductIdAndItemNumMap(List<String> productIds) {
@@ -360,7 +360,7 @@ public class OrderPrintServiceImpl implements OrderPrintService {
             return new HashMap<>();
         }
         List<Product> productList = productMapper.selectByProductIds(productIds);
-        return productList.stream().collect(Collectors.toMap(x -> x.getProductId().toString(), Product::getItemNum));
+        return productList.stream().collect(Collectors.toMap(x -> x.getProductId().toString(), Product::getItemNum,(v1,v2)->v1));
     }
 
     @Override
@@ -396,7 +396,7 @@ public class OrderPrintServiceImpl implements OrderPrintService {
             return new HashMap<>();
         }
 
-        return opLogisticsBOList.stream().collect(Collectors.toMap(OpLogisticsBO::getLogisticsId, x -> x));
+        return opLogisticsBOList.stream().collect(Collectors.toMap(OpLogisticsBO::getLogisticsId, x -> x,(v1,v2)->v1));
     }
 
     @Transactional(rollbackFor = Exception.class)
@@ -410,7 +410,7 @@ public class OrderPrintServiceImpl implements OrderPrintService {
         if (CollectionUtil.isEmpty(orderList)) {
             return false;
         }
-        Map<String, OpOrder> orderMap = orderList.stream().collect(Collectors.toMap(OpOrder::getOrderId, x -> x));
+        Map<String, OpOrder> orderMap = orderList.stream().collect(Collectors.toMap(OpOrder::getOrderId, x -> x,(v1,v2)->v1));
         List<String> validOrderIds = orderList.stream().map(e->e.getOrderId()).collect(Collectors.toList());
         List<String> existsExtOrderIds = opOrderExtMapper.selectOrderIdById(orderIds, shopIds);
         List<String> notExistsExtOrderIds = CollectionUtil.isEmpty(existsExtOrderIds) ? validOrderIds : new ArrayList<>();

ms-biz/src/main/java/com/ms/api/service/impl/ProductToDsItemServiceImpl.java

@@ -99,7 +99,7 @@ public class ProductToDsItemServiceImpl implements ProductToDsItemService {
         }
 
         List<ProductToDsItem> rows = productToDsItemMapper.getProductIdAndProductToDsItemMapByProductIds(productIds, sourcePlatform);
-        return rows.stream().collect(Collectors.toMap(ProductToDsItem::getProductId, x -> x));
+        return rows.stream().collect(Collectors.toMap(ProductToDsItem::getProductId, x -> x,(v1,v2)->v1));
     }
 }
 

ms-biz/src/main/java/com/ms/api/service/impl/PurchaseOrderServiceImpl.java

@@ -299,7 +299,7 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
         List<String> orderIds = orderList.stream().map(OpOrder::getOrderId).collect(Collectors.toList());
 
         Map<String, List<PurchaseOrderBO>> orderIdAndPurchaseOrdersMap = getOrderIdAndPurchaseOrdersMap(shopIds, orderIds, filter, true, false);
-        Map<Long, Shop> shopIdAndShopInfoMap = shopService.getShopByIds(shopIds).stream().collect(Collectors.toMap(Shop::getShopId, x -> x));
+        Map<Long, Shop> shopIdAndShopInfoMap = shopService.getShopByIds(shopIds).stream().collect(Collectors.toMap(Shop::getShopId, x -> x,(v1,v2)->v1));
         Map<String, String> orderIdAndSameOrderIdsMap = new HashMap<>();
         // TODO: 2023/8/28 配置表已经没有相关字段 跳过
 //        if (ObjectUtil.isNotNull(filter.getIsShowSameReceiverOrder()) && filter.getIsShowSameReceiverOrder()) {
@@ -331,7 +331,7 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
         }
         List<OpOrderOutstorageHistory> opOrderOutstorageHistoryRows = opOrderOutstorageHistoryService.getByIdList(opOrderOutstorageHistoryIds);
 
-        Map<String, OpOrderOutstorageHistory> orderIdAndOpOrderOutstrorageHistoryMap = opOrderOutstorageHistoryRows.stream().collect(Collectors.toMap(OpOrderOutstorageHistory::getOrderId, x -> x));
+        Map<String, OpOrderOutstorageHistory> orderIdAndOpOrderOutstrorageHistoryMap = opOrderOutstorageHistoryRows.stream().collect(Collectors.toMap(OpOrderOutstorageHistory::getOrderId, x -> x,(v1,v2)->v1));
 
         for (JSONObject order : orders) {
             if (isDs && !OrderConst.ORDER_STATUS_WAIT_SELLER_SEND_GOODS.equals(order.get("orderStatus"))) {
@@ -694,7 +694,7 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 
         if (needItems) {
             List<String> purchaseOrderIds = purchaseOrders.stream().map(x -> x.getPurchaseOrderId().toString()).collect(Collectors.toList());
-            Map<Integer, PurchaseOrderItem> purchaseOrderItemsMap = getPurchaseOrderItemsMapByPurchaseOrderIds(shopIds, purchaseOrderIds, StatusConst.normal).stream().collect(Collectors.toMap(PurchaseOrderItem::getPurchaseOrderId, x -> x));
+            Map<Integer, PurchaseOrderItem> purchaseOrderItemsMap = getPurchaseOrderItemsMapByPurchaseOrderIds(shopIds, purchaseOrderIds, StatusConst.normal).stream().collect(Collectors.toMap(PurchaseOrderItem::getPurchaseOrderId, x -> x,(v1,v2)->v1));
             for (PurchaseOrderBO purchaseOrder : purchaseOrders) {
                 if (purchaseOrderItemsMap.containsKey(purchaseOrder.getPurchaseOrderId().intValue())) {
                     purchaseOrder.setItem(purchaseOrderItemsMap.get(purchaseOrder.getPurchaseOrderId().intValue()));
@@ -739,7 +739,7 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 //            }
 //        }
 
-        return rows.stream().collect(Collectors.toMap(PurchaseOrderSetting::getPurchaseOrderId, x -> x));
+        return rows.stream().collect(Collectors.toMap(PurchaseOrderSetting::getPurchaseOrderId, x -> x,(v1,v2)->v1));
     }
 
     @Override
@@ -1339,7 +1339,7 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
             List<OpOrderChildBO> items = orderIdAndOpOrderChildMap.get(orderId);
             Map<Long, OpOrderChildBO> skuIdAndOrderChildMap = this.mergeOpOrderChildSameSku(items);
             List<AfterSale> currentOrderAfterSales = ObjectUtil.isNotEmpty(orderIdAndAftersalesMap.get(orderId)) ? orderIdAndAftersalesMap.get(orderId) : new ArrayList<>();
-            Map<String, AfterSale> childOrderIdAndAfterSaleMap = currentOrderAfterSales.stream().collect(Collectors.toMap(AfterSale::getOrderId, x -> x));
+            Map<String, AfterSale> childOrderIdAndAfterSaleMap = currentOrderAfterSales.stream().collect(Collectors.toMap(AfterSale::getOrderId, x -> x,(v1,v2)->v1));
             attachSourceItemInfoToOpOrderChilds(skuIdAndOrderChildMap, productIdAndProductToDsItemMap, childOrderIdAndAfterSaleMap);
             List<String> sourceItemIds = skuIdAndOrderChildMap.values().stream().map(OpOrderChildBO::getSourceItemId).collect(Collectors.toList());
 
@@ -1372,7 +1372,7 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
 
 //            orderAddressChangeApply = orderIdAndOrderAddressChangeApplyMap[orderId];
 
-            Map<Object, JSONObject> purchasePlatforms = returnPurchaseOrders.values().stream().collect(Collectors.toMap(x -> x.get("purchasePlatform"), x -> x));
+            Map<String, JSONObject> purchasePlatforms = ObjectUtil.isEmpty(returnPurchaseOrders) ? new HashMap<>() : returnPurchaseOrders.values().stream().collect(Collectors.toMap(x -> x.getString("purchasePlatform"), x -> x,(v1,v2)->v1));
             if (ObjectUtil.isEmpty(sourceItemIds) && purchasePlatforms.containsKey(PurchaseOrderConst.PURCHASE_PLATFORM1688_D_S)) {
                 needDeleteOpOrderDsOrderIds.add(orderId);
             }
@@ -1566,7 +1566,7 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
     private void rebuildNoPurchaseOrderItems(Map<Long, OpOrderChildBO> skuIdAndOrderChildMap, List<Long> hasPurchaseSkuIds, List<OpOrderChildLogistics> childOrderLogistics, List<OpOrderPriceProtection> priceProtectionList,
                                              Map<Long, List<OpOrderGivenProduct>> childOrderIdAndGivenProductsMap, List<JSONObject> returnOrderItems, List<JSONObject> noPurchaseOrderItems, BigDecimal orderTotalAmount) {
         Map<String, List<OpOrderChildLogistics>> childOrderIdAndLogisticsMap = childOrderLogistics.stream().collect(Collectors.groupingBy(OpOrderChildLogistics::getChildOrderId));
-        Map<String, OpOrderPriceProtection> childOrderIdAndPriceProtectionMap = priceProtectionList.stream().collect(Collectors.toMap(OpOrderPriceProtection::getChildOrderId, x -> x));
+        Map<String, OpOrderPriceProtection> childOrderIdAndPriceProtectionMap = priceProtectionList.stream().collect(Collectors.toMap(OpOrderPriceProtection::getChildOrderId, x -> x,(v1,v2)->v1));
         for (Map.Entry<Long, OpOrderChildBO> entry : skuIdAndOrderChildMap.entrySet()) {
             OpOrderChildBO item = entry.getValue();
             String skuSubNames = item.getSkuSubName();

ms-biz/src/main/java/com/ms/api/spi/order/SavePurchaseSettingService.java

@@ -218,9 +218,9 @@ public class SavePurchaseSettingService extends SPIBaseService implements Extens
             log.error("自动扣款协议请求失败，原因:" + jsonObject.getString("reason"));
             throw new RuntimeException(jsonObject.getString("reason"));
         } else {
-            JSONObject paymentAgreements = jsonObject.getJSONObject("data").getJSONObject("paymentAgreements");
-            for (Object paymentAgreement : paymentAgreements.values()) {
-                JSONObject obj = (JSONObject)paymentAgreement;
+            JSONArray paymentAgreements = jsonObject.getJSONObject("data").getJSONArray("paymentAgreements");
+            for (int i = 0; i < paymentAgreements.size(); i++) {
+                JSONObject obj = paymentAgreements.getJSONObject(i);
                 String signedStatus = obj.getString("signedStatus");
                 if (signedStatus.equals("true")) {
                     isSigned = true;

ms-biz/src/main/java/com/ms/api/spi/timer/MoveOpPageBufferTimerService.java

@@ -0,0 +1,28 @@
+package com.ms.api.spi.timer;
+
+import com.jinritemai.cloud.base.api.BaseRequest;
+import com.jinritemai.cloud.base.api.BaseResponse;
+import com.jinritemai.cloud.base.api.ExtensionService;
+import com.jinritemai.cloud.base.api.ExtensionServiceHandler;
+import com.ms.api.common.R;
+import com.ms.api.common.Ret;
+import com.ms.api.common.TimerBaseService;
+import com.ms.api.dto.ItemDTO;
+import com.ms.api.task.MoveOpPageBufferTaskService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+
+@ExtensionService("moveOpPageBufferTimer")
+@Slf4j
+public class MoveOpPageBufferTimerService extends TimerBaseService implements ExtensionServiceHandler<ItemDTO, Ret> {
+
+    @Autowired
+    MoveOpPageBufferTaskService moveOpPageBufferTaskService;
+
+    @Override
+    public BaseResponse<Ret> handle(BaseRequest<ItemDTO> req) {
+        moveOpPageBufferTaskService.runTask();
+        return R.ok(Ret.success());
+    }
+
+}

ms-dal/src/main/java/com/ms/dal/mapper/OpOrderRsyncPageBufferMapper.java

@@ -1,5 +1,7 @@
 package com.ms.dal.mapper;
 
+import java.util.List;
+
 import com.ms.dal.entity.OpOrderRsyncPageBuffer;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -23,4 +25,8 @@ public interface OpOrderRsyncPageBufferMapper {
     int updateByPrimaryKey(OpOrderRsyncPageBuffer record);
 
     int selectCountByShopIdAndQueueId(@Param("shopId")Long shopId, @Param("queueId")Long queueId);
+
+    List<OpOrderRsyncPageBuffer> selectByBufferIdAndLimit(@Param("startBufferId")Long startBufferId, @Param("limit")int limit);
+
+    void deleteByIdList(@Param("deleteBufferIds")List<Long> deleteBufferIds);
 }

ms-dal/src/main/java/com/ms/dal/mapper/OpOrderRsyncPageQueueMapper.java

@@ -24,7 +24,7 @@ public interface OpOrderRsyncPageQueueMapper {
 
     int updateByPrimaryKey(OpOrderRsyncPageQueue record);
 
-    void insertBatch(@Param("list") List<OpOrderRsyncPageQueue> list);
+    Long insertBatch(@Param("list") List<OpOrderRsyncPageQueue> list);
 
     OpOrderRsyncPageQueue queryFirstRowByQueueId(@Param("queueId") String queueId);
 

ms-dal/src/main/resources/mapper/OpOrderRsyncPageBufferMapper.xml

@@ -34,11 +34,24 @@
     <select id="selectCountByShopIdAndQueueId" resultType="java.lang.Integer">
         select count(*) from op_order_rsync_page_buffer where shop_id = #{shopId} and op_order_rsync_queue_id = #{queueId}
     </select>
+    <select id="selectByBufferIdAndLimit" resultType="com.ms.dal.entity.OpOrderRsyncPageBuffer">
+        select * from op_order_rsync_page_buffer
+        where op_order_rsync_page_buffer_id > #{startBufferId}
+        order by op_order_rsync_page_buffer_id asc
+        limit #{limit}
+    </select>
 
     <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
         delete from op_order_rsync_page_buffer
         where  op_order_rsync_page_buffer_id = #{opOrderRsyncPageBufferId,jdbcType=BIGINT}
     </delete>
+    <delete id="deleteByIdList">
+        delete from op_order_rsync_page_buffer
+        where  op_order_rsync_page_buffer_id IN
+        <foreach collection="deleteBufferIds" index="index" item="item" open="(" separator="," close=")">
+            #{item}
+        </foreach>
+    </delete>
     <insert id="insert" keyColumn="op_order_rsync_page_buffer_id" keyProperty="opOrderRsyncPageBufferId" parameterType="com.ms.dal.entity.OpOrderRsyncPageBuffer" useGeneratedKeys="true">
         insert into op_order_rsync_page_buffer
         ( op_order_rsync_page_buffer_id,op_order_rsync_queue_id,shop_id

ms-dal/src/main/resources/mapper/OpOrderRsyncPageQueueMapper.xml

@@ -99,7 +99,7 @@
                 <if test="gmtModified != null">#{gmtModified,jdbcType=TIMESTAMP},</if>
         </trim>
     </insert>
-    <insert id="insertBatch" >
+    <insert id="insertBatch" useGeneratedKeys="true" keyColumn="op_order_rsync_page_queue_id" keyProperty="opOrderRsyncPageQueueId" >
         insert into op_order_rsync_page_queue
         ( op_order_rsync_page_queue_id,op_order_rsync_queue_id,shop_id
         ,gmt_start_modified,gmt_end_modified,page_size

ms-web/src/main/java/com/ms/web/OrderTestController.java

@@ -25,6 +25,7 @@ import com.ms.api.dto.order.SearchDsOrderListRequestDTO;
 import com.ms.api.service.DistributionOrderService;
 import com.ms.api.service.OpOrderService;
 import com.ms.api.service.PurchaseOrderService;
+import com.ms.api.tool.CommonTool;
 import com.ms.api.util.OrderUtil;
 import com.ms.api.util.PurchaseOrderUtil;
 import com.ms.dal.mapper.OpOrderExtMapper;
@@ -33,6 +34,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
 /**
@@ -138,9 +140,9 @@ public class OrderTestController {
         return R.ok(Ret.success(result));
     }
 
-    @PostMapping("/manualRsyncDdOrders")
-    public BaseResponse<Ret> manualRsyncDdOrders(@RequestBody ManualRsyncDdOrdersDTO dto) {
-        ApiResult apiResult = orderUtil.rsyncOrder(AppConst.TEST_SHOP_ID, dto.getOrderIds());
+    @GetMapping("/manualRsyncDdOrders")
+    public BaseResponse<Ret> manualRsyncDdOrders(@RequestParam String orderIds) {
+        ApiResult apiResult = orderUtil.rsyncOrder(AppConst.TEST_SHOP_ID, CommonTool.splitWithComma(orderIds));
         if (!apiResult.isSuccess()) {
             return R.fail(apiResult.getMsg());
         }