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

统计

Browse Source
This commit is contained in:
wangw
2026-02-04 14:57:15 +08:00
parent 4deba098ce
commit ee78543ab8
5 changed files with 23 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
cash-api/order-server/src/main/java/com/czg/controller/pay/OrderPayController.java
View File

@@ -126,18 +126,18 @@ public class OrderPayController {
return orderPayService.ltPayOrder(ServletUtil.getClientIP(request), payParam); return orderPayService.ltPayOrder(ServletUtil.getClientIP(request), payParam);
} }
/** // /**
* 正扫 // * 正扫
*/ // */
@PostMapping("/scanPay") // @PostMapping("/scanPay")
@Debounce(value = "#payParam.checkOrderPay.orderId") // @Debounce(value = "#payParam.checkOrderPay.orderId")
public CzgResult<Map<String, Object>> scanPayOrder(@RequestHeader Long shopId, HttpServletRequest request, @Validated @RequestBody OrderPayParamDTO payParam) { // public CzgResult<Map<String, Object>> scanPayOrder(@RequestHeader Long shopId, HttpServletRequest request, @Validated @RequestBody OrderPayParamDTO payParam) {
payParam.setShopId(shopId); // payParam.setShopId(shopId);
return orderPayService.scanPayOrder(ServletUtil.getClientIP(request), payParam); // return orderPayService.scanPayOrder(ServletUtil.getClientIP(request), payParam);
} // }
/** /**
* 反扫 * 扫码收款
* authCode 必填 扫描码 * authCode 必填 扫描码
*/ */
@PostMapping("/microPay") @PostMapping("/microPay")

5
cash-common/cash-common-service/src/main/java/com/czg/order/entity/OrderInfo.java
View File

@@ -182,13 +182,14 @@ public class OrderInfo implements Serializable {
/** /**
* {@link com.czg.order.enums.PayEnums} * {@link com.czg.order.enums.PayEnums}
* 支付类型 * 支付类型
* 主扫 main_scan * 二维码收款 main_scan
* 被扫 back_scan * 扫码收款 back_scan
* 微信小程序 wechat_mini * 微信小程序 wechat_mini
* 支付宝小程序 alipay_mini * 支付宝小程序 alipay_mini
* 会员支付 vip_pay * 会员支付 vip_pay
* 现金支付 cash_pay * 现金支付 cash_pay
* 挂账支付 credit_pay * 挂账支付 credit_pay
* 霸王餐支付 free_pay
*/ */
private String payType; private String payType;

12
cash-common/cash-common-service/src/main/java/com/czg/order/entity/ShopOrderStatistic.java
View File

@@ -169,22 +169,22 @@ public class ShopOrderStatistic implements Serializable {
/** /**
* 被扫收款金额 * 被扫收款金额
*/ */
@ExcelProperty("被扫收款金额") @ExcelProperty("扫码收款金额")
private BigDecimal backScanPayAmount; private BigDecimal backScanPayAmount;
/** /**
* 被扫收款笔数 * 被扫收款笔数
*/ */
@ExcelProperty("被扫收款笔数") @ExcelProperty("扫码收款笔数")
private Long backScanPayCount; private Long backScanPayCount;
/** /**
* 主扫收款金额 * 二维码收款金额
*/ */
@ExcelProperty("主扫收款金额") @ExcelProperty("二维码收款金额")
private BigDecimal mainScanPayAmount; private BigDecimal mainScanPayAmount;
/** /**
* 主扫收款笔数 * 二维码收款笔数
*/ */
@ExcelProperty("主扫收款笔数") @ExcelProperty("二维码收款笔数")
private Long mainScanPayCount; private Long mainScanPayCount;
/** /**
* 挂账支付金额 * 挂账支付金额

5
cash-common/cash-common-service/src/main/java/com/czg/order/enums/PayEnums.java
View File

@@ -17,11 +17,12 @@ public enum PayEnums {
/** /**
* 主扫 * 主扫
*/ */
MAIN_SCAN("main_scan", "主扫"), MAIN_SCAN("main_scan", "二维码收款"),
/** /**
* 被扫 * 被扫
*/ */
BACK_SCAN("back_scan", "被扫"), // BACK_SCAN("back_scan", "被扫"),
BACK_SCAN("back_scan", "扫码收款"),
/** /**
* 微信小程序 * 微信小程序
*/ */

2
cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderPayServiceImpl.java
View File

@@ -290,7 +290,7 @@ public class OrderPayServiceImpl implements OrderPayService {
} }
String payOrderNo = orderInfo.getPlatformType() + CzgRandomUtils.snowflake(); String payOrderNo = orderInfo.getPlatformType() + CzgRandomUtils.snowflake();
Long paymentId = payService.initPayment(OrderPayment.orderPay(payParam.getShopId(), orderInfo.getId(), payOrderNo, orderInfo.getOrderAmount(), "")); Long paymentId = payService.initPayment(OrderPayment.orderPay(payParam.getShopId(), orderInfo.getId(), payOrderNo, orderInfo.getOrderAmount(), ""));
upOrderPayInfo(orderInfo.getId(), PayCst.Type.ALIPAY.equals(payParam.getPayType()) ? PayEnums.ALIPAY_MINI : PayEnums.WECHAT_MINI, paymentId, upOrderPayInfo(orderInfo.getId(), PayEnums.MAIN_SCAN, paymentId,
payParam.getCheckOrderPay() == null ? null : payParam.getCheckOrderPay().getRemark()); payParam.getCheckOrderPay() == null ? null : payParam.getCheckOrderPay().getRemark());
return payService.pay(payParam.getShopId(), CzgPayEnum.JS_PAY, return payService.pay(payParam.getShopId(), CzgPayEnum.JS_PAY,
CzgPayBaseReq.jsPayReq(payOrderNo, "扫码支付", orderInfo.getOrderAmount().multiply(PayService.MONEY_RATE).longValue(), CzgPayBaseReq.jsPayReq(payOrderNo, "扫码支付", orderInfo.getOrderAmount().multiply(PayService.MONEY_RATE).longValue(),