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

Merge remote-tracking branch 'origin/test' into test

Browse Source
This commit is contained in:
wangw
2025-12-22 10:24:45 +08:00
parent 102ee912a9 931b7805fe
commit f1b91cf536
7 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3,16 +3,13 @@ package com.czg.controller.admin;
import cn.hutool.core.date.DateUtil;
import cn.hutool.core.util.StrUtil;
import com.czg.annotation.SaAdminCheckPermission;
import com.czg.annotation.SaCheckMainShop;
import com.czg.market.dto.MkDistributionConfigDTO;
import com.czg.market.service.*;
import com.czg.market.vo.*;
import com.czg.market.vo.MkDistributionConfigVO;
import com.czg.order.dto.MkDistributionPayDTO;
import com.czg.resp.CzgResult;
import com.czg.sa.StpKit;
import com.czg.service.market.service.impl.AppWxServiceImpl;
import com.czg.utils.AssertUtil;
import com.mybatisflex.core.paginate.Page;
import jakarta.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -38,8 +35,6 @@ public class DistributionController {
private MkDistributionFlowService distributionFlowService;
@Resource
private MkDistributionWithdrawFlowService withdrawFlowService;
@Resource
private AppWxServiceImpl appWxService;
/**
* 配置信息详情

3
cash-api/market-server/src/main/java/com/czg/controller/user/UDistributionController.java
View File

@@ -13,7 +13,6 @@ import com.czg.market.vo.InviteUserVO;
import com.czg.market.vo.MkDistributionConfigVO;
import com.czg.resp.CzgResult;
import com.czg.sa.StpKit;
import com.czg.service.market.service.impl.AppWxServiceImpl;
import com.czg.utils.AssertUtil;
import com.mybatisflex.core.paginate.Page;
import jakarta.annotation.Resource;
@@ -35,8 +34,6 @@ public class UDistributionController {
@Resource
private MkDistributionUserService distributionUserService;
@Resource
private AppWxServiceImpl appWxService;
@Resource
private MkDistributionWithdrawFlowService withdrawFlowService;
@Resource
private MkDistributionFlowService distributionFlowService;

2
cash-api/market-server/src/main/java/com/czg/controller/user/UPpPackageController.java
View File

@@ -72,7 +72,7 @@ public class UPpPackageController {
*/
@GetMapping("/order")
public CzgResult<Page<PpOrderListVO>> getMyOrderList(GbOrderQueryParam reqVo) {
return CzgResult.success(ppPackageOrderService.queryOrderList(null, StpKit.USER.getLoginIdAsLong(), reqVo));
return CzgResult.success(ppPackageOrderService.queryOrderList(reqVo.getShopId(), StpKit.USER.getLoginIdAsLong(), reqVo));
}
/**

2
cash-api/product-server/src/main/java/com/czg/controller/admin/ConsStockFlowController.java
View File

@@ -43,7 +43,7 @@ public class ConsStockFlowController {
*/
@PostMapping("/ocr")
public CzgResult<Integer> ocr(@RequestBody OcrDTO ocrDTO) throws Exception {
URI uri = new URI("https://example.com/path");
URI uri = new URI(ocrDTO.getUrl());
URL url = uri.toURL();
InputStream stream = URLUtil.getStream(url);
return CzgResult.success(consStockFlowService.ocr(FileUtil.getName(ocrDTO.getUrl()), stream));