‘linchangsheng’ hai 5 meses
pai
achega
9a98379362

+ 1 - 1
mall-miniapp-service/src/main/java/com/gree/mall/miniapp/controller/pay/PayOrderController.java

@@ -132,7 +132,7 @@ public class PayOrderController {
             }
             String ip = IpUtil.getIpAddr(request);
             WorkerOrder workerOrder = payOrderLogic.upIsPay(orderId);
-            WorkerOrder payStatus = payOrderLogic.paid(workerOrder.getWorkerOrderId(), authCode, ip, payType);
+            WorkerOrder payStatus = payOrderLogic.paid(workerOrder.getOrderId(), authCode, ip, payType);
 
             return ResponseHelper.success(payStatus);
         } finally {

+ 1 - 1
mall-server-sync-api/src/main/java/com/gree/mall/manager/logic/SyncOrderInfoLogic.java

@@ -335,7 +335,7 @@ public class SyncOrderInfoLogic {
 
                 WorkOrderSearchReq workOrderSearchReq = new WorkOrderSearchReq();
 
-                List<String> collect = itfGreeSynDownloadRecs.stream().map(ItfGreeSynDownloadRec::getWorkOrderId).collect(Collectors.toList());
+                List<String> collect = itfGreeSynDownloadRecs.stream().map(ItfGreeSynDownloadRec::getWorkOrderId).distinct().collect(Collectors.toList());
                 List<Long> syncIds = itfGreeSynDownloadRecs.stream().map(ItfGreeSynDownloadRec::getSynReqId).collect(Collectors.toList());
 
                 itfGreeSynDownloadRecService.lambdaUpdate()