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 10:58:12 +08:00
parent 81b326853c b0dc49e770
commit f67b6cd714
21 changed files with 324 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4,6 +4,7 @@ import com.czg.account.dto.ShopActivateDTO;
import com.czg.account.service.ShopActivateService;
import com.czg.annotation.SaAdminCheckPermission;
import com.czg.resp.CzgResult;
import com.czg.sa.StpKit;
import jakarta.annotation.Resource;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.*;
@@ -39,6 +40,7 @@ public class ShopActivateController {
@SaAdminCheckPermission("activate:add")
@PostMapping
public CzgResult<Boolean> add(@RequestBody @Validated ShopActivateDTO activateDTO) {
activateDTO.setShopId(StpKit.USER.getShopId());
return CzgResult.success(shopActivateService.add(activateDTO));
}

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

@@ -7,6 +7,7 @@ import com.czg.account.dto.shopuser.ShopUserSummaryDTO;
import com.czg.account.entity.ShopUser;
import com.czg.account.service.ShopUserService;
import com.czg.annotation.SaAdminCheckPermission;
import com.czg.enums.ShopUserFlowBizEnum;
import com.czg.resp.CzgResult;
import com.czg.sa.StpKit;
import com.mybatisflex.core.paginate.Page;
@@ -75,6 +76,7 @@ public class ShopUserController {
@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));
}

2
cash-api/order-server/src/main/java/com/czg/controller/PayController.java → cash-api/order-server/src/main/java/com/czg/controller/OrderPayController.java
View File

@@ -22,7 +22,7 @@ import java.util.Map;
*/
@RestController
@RequestMapping("/pay")
public class PayController {
public class OrderPayController {
@Resource
private PayService payService;

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

@@ -0,0 +1,75 @@
package com.czg.controller;
import com.czg.resp.CzgResult;
import com.czg.sa.StpKit;
import com.czg.service.order.dto.VipPayParamDTO;
import com.czg.service.order.service.PayService;
import com.czg.utils.ServletUtil;
import jakarta.annotation.Resource;
import jakarta.servlet.http.HttpServletRequest;
import org.springframework.validation.annotation.Validated;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import java.util.Map;
/**
* 会员 支付
*
* @author ww
* @description
*/
@RestController
@RequestMapping("/pay")
public class VipPayController {
@Resource
private PayService payService;
/**
* js支付
* payType 必填 支付方式，aliPay 支付宝，wechatPay 微信
* openId 必填
*/
@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"));
return payService.jsPayVip(ServletUtil.getClientIPByHeader(request), payParam);
}
/**
* 小程序支付
* payType 必填 支付方式，aliPay 支付宝，wechatPay 微信
* openId 必填
*/
@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"));
return payService.ltPayVip(ServletUtil.getClientIPByHeader(request), payParam);
}
/**
* 正扫
*/
@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"));
return payService.scanPayVip(ServletUtil.getClientIPByHeader(request), payParam);
}
/**
* 反扫
* authCode 必填 扫描码
*/
@PostMapping("microPayVip")
public CzgResult<Map<String, Object>> microPayVip(@Validated @RequestBody VipPayParamDTO payParam) {
payParam.setUserId(StpKit.USER.getLoginIdAsLong());
payParam.setPlatformType(ServletUtil.getHeaderIgnoreCase(ServletUtil.getRequest(),"platformType"));
return payService.microPayVip(payParam);
}
}

2
cash-api/order-server/src/main/resources/application-dev.yml
View File

@@ -30,7 +30,7 @@ dubbo:
application:
name: order-server
qos-port: 22231
qos-enable: true
# qos-enable: true
registry:
address: nacos://121.40.109.122:8848 # Nacos 服务地址
group: server

2
cash-api/order-server/src/main/resources/application-test.yml
View File

@@ -31,7 +31,7 @@ dubbo:
application:
name: order-server
qos-port: 22232
qos-enable: true
# qos-enable: true
registry:
address: nacos://121.40.109.122:8848 # Nacos 服务地址
group: server-test