update

jsowell-admin/src/main/java/com/jsowell/api/uniapp/TempController.java

@@ -21,6 +21,7 @@ import com.jsowell.pile.service.*;
 import com.jsowell.pile.service.programlogic.AbstractProgramLogic;
 import com.jsowell.pile.service.programlogic.ProgramLogicFactory;
 import com.jsowell.pile.vo.uniapp.MemberBalanceVO;
+import com.jsowell.pile.vo.web.PileStationVO;
 import com.jsowell.service.OrderService;
 import com.jsowell.service.TempService;
 import org.apache.commons.collections4.CollectionUtils;
@@ -58,6 +59,9 @@ public class TempController extends BaseController {
     @Autowired
     private MemberBasicInfoService memberBasicInfoService;
 
+    @Autowired
+    private PileStationInfoService pileStationInfoService;
+
     @Autowired
     private OrderService orderService;
 
@@ -156,8 +160,9 @@ public class TempController extends BaseController {
             List<String> dateList = DateUtils.getAllDatesInTheDateRange(startTime, endTime);
 
             dto.getStationIdList().parallelStream().forEach(stationId -> {
+                PileStationVO stationInfo = pileStationInfoService.getStationInfo(stationId);
                 for (String tradeDate : dateList) {
-                    settleOrderReportService.generateDailyOrderReports(stationId, tradeDate);
+                    settleOrderReportService.generateDailyOrderReports(stationInfo, tradeDate);
                 }
             });
 
@@ -261,11 +266,9 @@ public class TempController extends BaseController {
             String endTime = dto.getEndTime();
             // 获取日期区间内所有日期
             List<String> dateList = DateUtils.getAllDatesInTheDateRange(startTime, endTime);
-
             for (String tradeDate : dateList) {
                 orderBasicInfoService.orderSplittingOperations(dto.getMerchantId(), tradeDate);
             }
-
             response = new RestApiResponse<>();
         } catch (BusinessException e) {
             logger.warn("手动接口执行订单分账逻辑-warn", e);

jsowell-admin/src/main/resources/application-dev.yml

@@ -162,7 +162,7 @@ wechat:
 
 # 汇付支付
 adapay:
-  debugFlag: true
+  debugFlag: false
   prodMode: false
   callback: http://192.168.2.3:8080/uniapp/pay/adapayCallback
   jsowell: