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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
Tankaikai
2025-02-18 14:51:21 +08:00
parent cc4616df01 f80683aef8
commit 78d7c32638
23 changed files with 475 additions and 74 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
cash-api/account-server/src/main/java/com/czg/controller/admin/ShopUserController.java
View File

@@ -17,6 +17,7 @@ import org.springframework.web.bind.annotation.*;
/**
* 店铺用户管理
*
* @author Administrator
*/
@RestController
@@ -28,6 +29,7 @@ public class ShopUserController {
/**
* 获取店铺用户概述信息
*
* @param isVip 0 非vip 1 vip
* @return 概述信息
*/
@@ -39,7 +41,8 @@ public class ShopUserController {
/**
* 获取店铺用户列表
* @param key 昵称或手机号
*
* @param key 昵称或手机号
* @param isVip 0 非vip 1 vip
* @return 用户列表
*/
@@ -51,6 +54,7 @@ public class ShopUserController {
/**
* 店铺用户信息添加
*
* @return 是否成功
*/
@SaAdminCheckPermission("shopUser:add")
@@ -61,6 +65,7 @@ public class ShopUserController {
/**
* 店铺用户信息修改
*
* @return 是否成功
*/
@SaAdminCheckPermission("shopUser:edit")
@@ -71,13 +76,14 @@ public class ShopUserController {
/**
* 店铺用户余额修改
*
* @return 是否成功
*/
@SaAdminCheckPermission("shopUser:editFlow")
@PutMapping("/money")
public CzgResult<Boolean> editMoney(@RequestBody @Validated ShopUserMoneyEditDTO shopUserMoneyEditDTO) {
shopUserMoneyEditDTO.setBizEnum(ShopUserFlowBizEnum.ADMIN_IN);
return CzgResult.success(shopUserService.updateMoney(StpKit.USER.getShopId(), shopUserMoneyEditDTO));
return CzgResult.success(shopUserService.updateMoney(StpKit.USER.getShopId(), shopUserMoneyEditDTO) > 0L);
}
}

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

@@ -11,7 +11,8 @@ import org.springframework.web.bind.annotation.RestController;
import java.util.List;
/**
* 店铺充值活动管理
* 用户店铺充值活动管理
*
* @author ww
*/
@RestController

17
cash-api/order-server/src/main/java/com/czg/controller/VipPayController.java
View File

@@ -27,6 +27,15 @@ public class VipPayController {
@Resource
private PayService payService;
/**
* 现金充值
*/
@PostMapping("cashPayVip")
public CzgResult<Object> cashPayVip(@Validated @RequestBody VipPayParamDTO payParam) {
payParam.setUserId(StpKit.USER.getLoginIdAsLong());
payParam.setPlatformType(ServletUtil.getHeaderIgnoreCase(ServletUtil.getRequest(), "platformType"));
return payService.cashPayVip(payParam);
}
/**
* js支付
@@ -36,7 +45,7 @@ public class VipPayController {
@PostMapping("jsPayVip")
public CzgResult<Map<String, Object>> jsPayVip(HttpServletRequest request, @Validated @RequestBody VipPayParamDTO payParam) {
payParam.setUserId(StpKit.USER.getLoginIdAsLong());
payParam.setPlatformType(ServletUtil.getHeaderIgnoreCase(ServletUtil.getRequest(),"platformType"));
payParam.setPlatformType(ServletUtil.getHeaderIgnoreCase(ServletUtil.getRequest(), "platformType"));
return payService.jsPayVip(ServletUtil.getClientIPByHeader(request), payParam);
}
@@ -48,7 +57,7 @@ public class VipPayController {
@PostMapping("ltPayVip")
public CzgResult<Map<String, Object>> ltPayVip(HttpServletRequest request, @Validated @RequestBody VipPayParamDTO payParam) {
payParam.setUserId(StpKit.USER.getLoginIdAsLong());
payParam.setPlatformType(ServletUtil.getHeaderIgnoreCase(ServletUtil.getRequest(),"platformType"));
payParam.setPlatformType(ServletUtil.getHeaderIgnoreCase(ServletUtil.getRequest(), "platformType"));
return payService.ltPayVip(ServletUtil.getClientIPByHeader(request), payParam);
}
@@ -58,7 +67,7 @@ public class VipPayController {
@PostMapping("scanPayVip")
public CzgResult<Map<String, Object>> scanPayVip(HttpServletRequest request, @Validated @RequestBody VipPayParamDTO payParam) {
payParam.setUserId(StpKit.USER.getLoginIdAsLong());
payParam.setPlatformType(ServletUtil.getHeaderIgnoreCase(ServletUtil.getRequest(),"platformType"));
payParam.setPlatformType(ServletUtil.getHeaderIgnoreCase(ServletUtil.getRequest(), "platformType"));
return payService.scanPayVip(ServletUtil.getClientIPByHeader(request), payParam);
}
@@ -69,7 +78,7 @@ public class VipPayController {
@PostMapping("microPayVip")
public CzgResult<Map<String, Object>> microPayVip(@Validated @RequestBody VipPayParamDTO payParam) {
payParam.setUserId(StpKit.USER.getLoginIdAsLong());
payParam.setPlatformType(ServletUtil.getHeaderIgnoreCase(ServletUtil.getRequest(),"platformType"));
payParam.setPlatformType(ServletUtil.getHeaderIgnoreCase(ServletUtil.getRequest(), "platformType"));
return payService.microPayVip(payParam);
}
}