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

获取订单详情是修改店铺 Id

Browse Source
This commit is contained in:
gong
2025-12-20 17:50:05 +08:00
parent 2bc5c8cff3
commit 143eab9244
3 changed files with 2 additions and 9 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.date.DateUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.czg.annotation.SaAdminCheckPermission; import com.czg.annotation.SaAdminCheckPermission;
import com.czg.annotation.SaCheckMainShop;
import com.czg.market.dto.MkDistributionConfigDTO; import com.czg.market.dto.MkDistributionConfigDTO;
import com.czg.market.service.*; 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.order.dto.MkDistributionPayDTO;
import com.czg.resp.CzgResult; import com.czg.resp.CzgResult;
import com.czg.sa.StpKit; import com.czg.sa.StpKit;
import com.czg.service.market.service.impl.AppWxServiceImpl;
import com.czg.utils.AssertUtil; import com.czg.utils.AssertUtil;
import com.mybatisflex.core.paginate.Page;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
import org.springframework.validation.annotation.Validated; import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*; import org.springframework.web.bind.annotation.*;
@@ -38,8 +35,6 @@ public class DistributionController {
private MkDistributionFlowService distributionFlowService; private MkDistributionFlowService distributionFlowService;
@Resource @Resource
private MkDistributionWithdrawFlowService withdrawFlowService; 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.market.vo.MkDistributionConfigVO;
import com.czg.resp.CzgResult; import com.czg.resp.CzgResult;
import com.czg.sa.StpKit; import com.czg.sa.StpKit;
import com.czg.service.market.service.impl.AppWxServiceImpl;
import com.czg.utils.AssertUtil; import com.czg.utils.AssertUtil;
import com.mybatisflex.core.paginate.Page; import com.mybatisflex.core.paginate.Page;
import jakarta.annotation.Resource; import jakarta.annotation.Resource;
@@ -35,8 +34,6 @@ public class UDistributionController {
@Resource @Resource
private MkDistributionUserService distributionUserService; private MkDistributionUserService distributionUserService;
@Resource @Resource
private AppWxServiceImpl appWxService;
@Resource
private MkDistributionWithdrawFlowService withdrawFlowService; private MkDistributionWithdrawFlowService withdrawFlowService;
@Resource @Resource
private MkDistributionFlowService distributionFlowService; private MkDistributionFlowService distributionFlowService;

1
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/PpPackageOrderServiceImpl.java
View File

@@ -108,6 +108,7 @@ public class PpPackageOrderServiceImpl extends ServiceImpl<PpPackageOrderMapper,
} }
PpPackage aPackage = ppPackageService.getById(order.getPackageId()); PpPackage aPackage = ppPackageService.getById(order.getPackageId());
aPackage.setShopId(order.getShopId());
orderDto.setPackageInfo(ppPackageService.convertPackageToVo(aPackage)); orderDto.setPackageInfo(ppPackageService.convertPackageToVo(aPackage));
return orderDto; return orderDto;