diff --git a/cash-api/market-server/src/main/java/com/czg/controller/user/URechargeController.java b/cash-api/market-server/src/main/java/com/czg/controller/user/URechargeController.java index 8e964700..2f0d7f93 100644 --- a/cash-api/market-server/src/main/java/com/czg/controller/user/URechargeController.java +++ b/cash-api/market-server/src/main/java/com/czg/controller/user/URechargeController.java @@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.RestController; import java.util.List; /** - * 会员相关 + * 充值相关 * * @author Administrator */ diff --git a/cash-common/cash-common-sa-token/src/main/java/com/czg/sa/MyStpLogic.java b/cash-common/cash-common-sa-token/src/main/java/com/czg/sa/MyStpLogic.java index 346c2ee5..043b12bb 100644 --- a/cash-common/cash-common-sa-token/src/main/java/com/czg/sa/MyStpLogic.java +++ b/cash-common/cash-common-sa-token/src/main/java/com/czg/sa/MyStpLogic.java @@ -19,6 +19,7 @@ import com.czg.exception.CzgException; import com.mybatisflex.core.row.DbChain; import lombok.Getter; import lombok.extern.slf4j.Slf4j; +import org.springframework.stereotype.Component; import java.util.List; import java.util.Map; @@ -37,6 +38,8 @@ public class MyStpLogic { return "PC".equals(SaHolder.getRequest().getHeader("Platformtype")); } + + public enum LoginType { MANAGER, USER, STAFF } @@ -160,6 +163,7 @@ public class MyStpLogic { return headId == null ? null : Long.parseLong(headId.toString()); } + /** * 获取店铺id * diff --git a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopRechargeServiceImpl.java b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopRechargeServiceImpl.java index a06a2a14..16a99bed 100644 --- a/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopRechargeServiceImpl.java +++ b/cash-service/market-service/src/main/java/com/czg/service/market/service/impl/MkShopRechargeServiceImpl.java @@ -4,8 +4,10 @@ import cn.hutool.core.bean.BeanUtil; import cn.hutool.core.util.StrUtil; import com.alibaba.fastjson2.JSONArray; import com.czg.account.dto.shopuser.ShopUserMoneyEditDTO; +import com.czg.account.entity.ShopInfo; import com.czg.account.entity.ShopUser; import com.czg.account.service.MemberPointsService; +import com.czg.account.service.ShopInfoService; import com.czg.account.service.ShopUserService; import com.czg.enums.ShopUserFlowBizEnum; import com.czg.exception.CzgException; @@ -61,9 +63,15 @@ public class MkShopRechargeServiceImpl extends ServiceImpl