czg_team/cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

订单分账处理

Browse Source
This commit is contained in:
张松
2025-10-27 19:22:10 +08:00
parent 30f35128fd
commit cf492b32f1
16 changed files with 548 additions and 633 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
cash-api/market-server/src/main/java/com/czg/controller/admin/DistributionController.java
View File

@@ -107,9 +107,10 @@ public class DistributionController {
*/
@GetMapping("distributionFlow")
public CzgResult<Map<String, Object>> distributionFlow(@RequestParam(required = false) String startTime, @RequestParam(required = false) String endTime,
@RequestParam(required = false) String key, @RequestParam(required = false) String status) {
@RequestParam(required = false) String key, @RequestParam(required = false) String status,
@RequestParam(required = false) Long id) {
return CzgResult.success(distributionFlowService.pageInfo(StpKit.USER.getShopId(),
StrUtil.isNotBlank(startTime) ? DateUtil.parseLocalDateTime(startTime) : null, StrUtil.isNotBlank(endTime) ? DateUtil.parseLocalDateTime(endTime) : null, key, status));
StrUtil.isNotBlank(startTime) ? DateUtil.parseLocalDateTime(startTime) : null, StrUtil.isNotBlank(endTime) ? DateUtil.parseLocalDateTime(endTime) : null, key, status, id));
}

3
cash-api/order-server/src/main/java/com/czg/controller/NotifyController.java
View File

@@ -15,7 +15,6 @@ import com.czg.order.service.OrderInfoService;
import com.czg.order.service.OrderPaymentService;
import com.czg.order.service.ShopTableOrderStatisticService;
import com.czg.service.Impl.WxServiceImpl;
import com.czg.system.service.WxService;
import com.czg.task.StatisticTask;
import com.czg.utils.AssertUtil;
import com.ijpay.core.kit.AesUtil;
@@ -50,7 +49,7 @@ public class NotifyController {
@Resource
private ShopTableOrderStatisticService shopTableOrderStatisticService;
@Resource
private WxService wxService;
private WxServiceImpl wxService;
@Resource
private MkDistributionUserService distributionUserService;
@Resource