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

充值改造

This commit is contained in:
张松 2025-09-25 15:33:13 +08:00
parent 35e2f9abe5
commit 0d5cb268b0
3 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RestController;
import java.util.List; import java.util.List;
/** /**
* 会员相关 * 充值相关
* *
* @author Administrator * @author Administrator
*/ */

4
cash-common/cash-common-sa-token/src/main/java/com/czg/sa/MyStpLogic.java
View File

@ -19,6 +19,7 @@ import com.czg.exception.CzgException;
import com.mybatisflex.core.row.DbChain; import com.mybatisflex.core.row.DbChain;
import lombok.Getter; import lombok.Getter;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.springframework.stereotype.Component;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -37,6 +38,8 @@ public class MyStpLogic {
return "PC".equals(SaHolder.getRequest().getHeader("Platformtype")); return "PC".equals(SaHolder.getRequest().getHeader("Platformtype"));
} }
public enum LoginType { public enum LoginType {
MANAGER, USER, STAFF MANAGER, USER, STAFF
} }
@ -160,6 +163,7 @@ public class MyStpLogic {
return headId == null ? null : Long.parseLong(headId.toString()); return headId == null ? null : Long.parseLong(headId.toString());
} }
/** /**
* 获取店铺id * 获取店铺id
* *

8
cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopRechargeServiceImpl.java
View File

@ -4,8 +4,10 @@ import cn.hutool.core.bean.BeanUtil;
import cn.hutool.core.util.StrUtil; import cn.hutool.core.util.StrUtil;
import com.alibaba.fastjson2.JSONArray; import com.alibaba.fastjson2.JSONArray;
import com.czg.account.dto.shopuser.ShopUserMoneyEditDTO; import com.czg.account.dto.shopuser.ShopUserMoneyEditDTO;
import com.czg.account.entity.ShopInfo;
import com.czg.account.entity.ShopUser; import com.czg.account.entity.ShopUser;
import com.czg.account.service.MemberPointsService; import com.czg.account.service.MemberPointsService;
import com.czg.account.service.ShopInfoService;
import com.czg.account.service.ShopUserService; import com.czg.account.service.ShopUserService;
import com.czg.enums.ShopUserFlowBizEnum; import com.czg.enums.ShopUserFlowBizEnum;
import com.czg.exception.CzgException; import com.czg.exception.CzgException;
@ -61,9 +63,15 @@ public class MkShopRechargeServiceImpl extends ServiceImpl<MkShopRechargeMapper,
private MemberPointsService memberPointsService; private MemberPointsService memberPointsService;
@Resource @Resource
private MkShopCouponRecordService shopCouponRecordService; private MkShopCouponRecordService shopCouponRecordService;
@DubboReference
private ShopInfoService shopInfoService;
@Override @Override
public MkShopRechargeVO detail(Long shopId) { public MkShopRechargeVO detail(Long shopId) {
ShopInfo shopInfo = shopInfoService.getById(shopId);
if (shopInfo.getMainId() != null) {
shopId = shopInfo.getMainId();
}
MkShopRecharge shopRecharge = getOne(new QueryWrapper().eq(MkShopRecharge::getMasterShopId, shopId)); MkShopRecharge shopRecharge = getOne(new QueryWrapper().eq(MkShopRecharge::getMasterShopId, shopId));
if (shopRecharge == null) { if (shopRecharge == null) {
shopRecharge = new MkShopRecharge(); shopRecharge = new MkShopRecharge();