From 143eab92440db842984c70b2045e8ba9ca9f7c21 Mon Sep 17 00:00:00 2001 From: gong <1157756119@qq.com> Date: Sat, 20 Dec 2025 17:50:05 +0800 Subject: [PATCH 1/5] =?UTF-8?q?=E8=8E=B7=E5=8F=96=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E8=AF=A6=E6=83=85=E6=98=AF=E4=BF=AE=E6=94=B9=E5=BA=97=E9=93=BA?= =?UTF-8?q?=20Id?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../com/czg/controller/admin/DistributionController.java | 7 +------ .../com/czg/controller/user/UDistributionController.java | 3 --- .../market/service/impl/PpPackageOrderServiceImpl.java | 1 + 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/cash-api/market-server/src/main/java/com/czg/controller/admin/DistributionController.java b/cash-api/market-server/src/main/java/com/czg/controller/admin/DistributionController.java index 3ab8d27d7..a0d77f7e8 100644 --- a/cash-api/market-server/src/main/java/com/czg/controller/admin/DistributionController.java +++ b/cash-api/market-server/src/main/java/com/czg/controller/admin/DistributionController.java @@ -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; /** * 配置信息详情 diff --git a/cash-api/market-server/src/main/java/com/czg/controller/user/UDistributionController.java b/cash-api/market-server/src/main/java/com/czg/controller/user/UDistributionController.java index 469438350..e24682984 100644 --- a/cash-api/market-server/src/main/java/com/czg/controller/user/UDistributionController.java +++ b/cash-api/market-server/src/main/java/com/czg/controller/user/UDistributionController.java @@ -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; diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/PpPackageOrderServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/PpPackageOrderServiceImpl.java index 42ee2d561..c6e98f9fc 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/PpPackageOrderServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/PpPackageOrderServiceImpl.java @@ -108,6 +108,7 @@ public class PpPackageOrderServiceImpl extends ServiceImpl Date: Sat, 20 Dec 2025 17:58:51 +0800 Subject: [PATCH 2/5] =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=AB=AF=E4=B8=8D?= =?UTF-8?q?=E8=BF=94=E5=9B=9E=20=E6=9C=AA=E4=B8=8A=E6=9E=B6=E5=A5=97?= =?UTF-8?q?=E9=A4=90?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../czg/service/market/service/impl/PpPackageServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/PpPackageServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/PpPackageServiceImpl.java index 2f528de45..04b59d0eb 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/PpPackageServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/PpPackageServiceImpl.java @@ -163,6 +163,9 @@ public class PpPackageServiceImpl extends ServiceImpl Date: Sat, 20 Dec 2025 18:04:21 +0800 Subject: [PATCH 3/5] =?UTF-8?q?like=20=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../market/service/impl/PpPackageServiceImpl.java | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/PpPackageServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/PpPackageServiceImpl.java index 04b59d0eb..10e57b70c 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/PpPackageServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/PpPackageServiceImpl.java @@ -1,6 +1,7 @@ package com.czg.service.market.service.impl; import cn.hutool.core.bean.BeanUtil; +import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson2.JSONArray; import com.czg.account.entity.ShopConfig; import com.czg.account.entity.ShopInfo; @@ -167,9 +168,12 @@ public class PpPackageServiceImpl extends ServiceImpl { q.eq(PpPackage::getShopId, shopId).or(q1 -> { From 94baf2e587c981aad47dc7ed1daaf74ab3fe1ab2 Mon Sep 17 00:00:00 2001 From: gong <1157756119@qq.com> Date: Mon, 22 Dec 2025 09:50:43 +0800 Subject: [PATCH 4/5] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E7=AD=9B=E9=80=89=E5=BA=97=E9=93=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/czg/controller/user/UPpPackageController.java | 2 +- .../src/main/resources/mapper/PpPackageOrderMapper.xml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cash-api/market-server/src/main/java/com/czg/controller/user/UPpPackageController.java b/cash-api/market-server/src/main/java/com/czg/controller/user/UPpPackageController.java index 048d687c9..68a3e5574 100644 --- a/cash-api/market-server/src/main/java/com/czg/controller/user/UPpPackageController.java +++ b/cash-api/market-server/src/main/java/com/czg/controller/user/UPpPackageController.java @@ -72,7 +72,7 @@ public class UPpPackageController { */ @GetMapping("/order") public CzgResult> getMyOrderList(GbOrderQueryParam reqVo) { - return CzgResult.success(ppPackageOrderService.queryOrderList(null, StpKit.USER.getLoginIdAsLong(), reqVo)); + return CzgResult.success(ppPackageOrderService.queryOrderList(reqVo.getShopId(), StpKit.USER.getLoginIdAsLong(), reqVo)); } /** diff --git a/cash-service/market-service/src/main/resources/mapper/PpPackageOrderMapper.xml b/cash-service/market-service/src/main/resources/mapper/PpPackageOrderMapper.xml index ee356758d..489fc33e2 100644 --- a/cash-service/market-service/src/main/resources/mapper/PpPackageOrderMapper.xml +++ b/cash-service/market-service/src/main/resources/mapper/PpPackageOrderMapper.xml @@ -17,10 +17,10 @@ left join tb_user_info u on o.user_id = u.id where 1=1 - and o.shop_id = #{shopId} and o.status != 'ing' + and o.shop_id = #{shopId} - and o.user_id = #{userId} + and o.user_id = #{userId} and o.status != 'ing' and o.order_no = #{param.orderNo} From 931b7805fe81222a3fcd01eb0deae35dc5ab5597 Mon Sep 17 00:00:00 2001 From: gong <1157756119@qq.com> Date: Mon, 22 Dec 2025 10:15:12 +0800 Subject: [PATCH 5/5] =?UTF-8?q?ocr=20=E8=AF=86=E5=88=AB=20bug=20fix?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/czg/controller/admin/ConsStockFlowController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cash-api/product-server/src/main/java/com/czg/controller/admin/ConsStockFlowController.java b/cash-api/product-server/src/main/java/com/czg/controller/admin/ConsStockFlowController.java index f6799b85b..c529c9027 100644 --- a/cash-api/product-server/src/main/java/com/czg/controller/admin/ConsStockFlowController.java +++ b/cash-api/product-server/src/main/java/com/czg/controller/admin/ConsStockFlowController.java @@ -43,7 +43,7 @@ public class ConsStockFlowController { */ @PostMapping("/ocr") public CzgResult 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));