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

测试

Browse Source
This commit is contained in:
张松
2025-03-07 18:09:13 +08:00
parent dab5aa62f7
commit db7cf1767c
2 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -36,84 +36,84 @@ public class ShopOrderStatistic implements Serializable {
/** /**
* 销售额 * 销售额
*/ */
private BigDecimal saleAmount; private BigDecimal saleAmount = BigDecimal.ZERO;
/** /**
* 销售数量 * 销售数量
*/ */
private Long saleCount; private Long saleCount = 0L;
/** /**
* 优惠金额 * 优惠金额
*/ */
private BigDecimal discountAmount; private BigDecimal discountAmount = BigDecimal.ZERO;
/** /**
* 优惠笔数 * 优惠笔数
*/ */
private Long discountCount; private Long discountCount = 0L;
/** /**
* 退款金额 * 退款金额
*/ */
private BigDecimal refundAmount; private BigDecimal refundAmount = BigDecimal.ZERO;
/** /**
* 退款笔数 * 退款笔数
*/ */
private Long refundCount; private Long refundCount = 0L;
/** /**
* 微信支付笔数 * 微信支付笔数
*/ */
private Long wechatPayCount; private Long wechatPayCount = 0L;
/** /**
* 位置支付金额 * 位置支付金额
*/ */
private BigDecimal wechatPayAmount; private BigDecimal wechatPayAmount = BigDecimal.ZERO;
/** /**
* 支付宝支付笔数 * 支付宝支付笔数
*/ */
private Long aliPayCount; private Long aliPayCount = 0L;
/** /**
* 支付宝支付金额 * 支付宝支付金额
*/ */
private BigDecimal aliPayAmount; private BigDecimal aliPayAmount = BigDecimal.ZERO;
/** /**
* 挂账支付笔数 * 挂账支付笔数
*/ */
private Long creditPayCount; private Long creditPayCount = 0L;
/** /**
* 挂账支付金额 * 挂账支付金额
*/ */
private BigDecimal creditPayAmount; private BigDecimal creditPayAmount = BigDecimal.ZERO;
/** /**
* 会员支付笔数 * 会员支付笔数
*/ */
private Long memberPayCount; private Long memberPayCount = 0L;
/** /**
* 会员支付金额 * 会员支付金额
*/ */
private BigDecimal memberPayAmount; private BigDecimal memberPayAmount = BigDecimal.ZERO;
/** /**
* 主扫支付笔数 * 主扫支付笔数
*/ */
private Long scanPayCount; private Long scanPayCount = 0L;
/** /**
* 主扫支付金额 * 主扫支付金额
*/ */
private BigDecimal scanPayAmount; private BigDecimal scanPayAmount = BigDecimal.ZERO;
private Long cashPayCount; private Long cashPayCount = 0L;
private BigDecimal cashPayAmount; private BigDecimal cashPayAmount = BigDecimal.ZERO;
/** /**
* 店铺id * 店铺id

3
cash-service/account-service/src/main/java/com/czg/service/account/service/impl/UserAuthorizationServiceImpl.java
View File

@@ -16,6 +16,7 @@ import com.czg.sa.MyStpLogic;
import com.czg.sa.StpKit; import com.czg.sa.StpKit;
import com.czg.service.account.util.AlipayUtil; import com.czg.service.account.util.AlipayUtil;
import com.czg.service.account.util.WechatAuthUtil; import com.czg.service.account.util.WechatAuthUtil;
import lombok.extern.slf4j.Slf4j;
import org.checkerframework.checker.units.qual.C; import org.checkerframework.checker.units.qual.C;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@@ -25,6 +26,7 @@ import javax.annotation.Resource;
* @author Administrator * @author Administrator
*/ */
@Service @Service
@Slf4j
public class UserAuthorizationServiceImpl implements UserAuthorizationService { public class UserAuthorizationServiceImpl implements UserAuthorizationService {
@Resource @Resource
private WechatAuthUtil wechatAuthUtil; private WechatAuthUtil wechatAuthUtil;
@@ -35,6 +37,7 @@ public class UserAuthorizationServiceImpl implements UserAuthorizationService {
@Override @Override
public String getOpenId(String code, String source) { public String getOpenId(String code, String source) {
log.info(code);
String openId; String openId;
if (UserAuthSourceEnum.WECHAT.getValue().equals(source)) { if (UserAuthSourceEnum.WECHAT.getValue().equals(source)) {
openId = wechatAuthUtil.getSessionKeyOrOpenId(code, true); openId = wechatAuthUtil.getSessionKeyOrOpenId(code, true);