From cb8b5141c5626c7810905bf28f6d0002f1dda848 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Tue, 25 Nov 2025 09:50:30 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BD=99=E9=A2=9D=E6=94=AF=E4=BB=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/czg/order/vo/CountPayTypeVo.java | 9 +++++---- .../system/service/impl/SysParamsServiceImpl.java | 11 ++++++++--- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/vo/CountPayTypeVo.java b/cash-common/cash-common-service/src/main/java/com/czg/order/vo/CountPayTypeVo.java index a18dd697b..20dde894c 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/order/vo/CountPayTypeVo.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/vo/CountPayTypeVo.java @@ -30,13 +30,14 @@ public class CountPayTypeVo { private static final Map PAY_TYPE_MAPPING = new LinkedHashMap<>(); static { - PAY_TYPE_MAPPING.put("memberPay", "会员支付"); PAY_TYPE_MAPPING.put("cashPay", "现金支付"); PAY_TYPE_MAPPING.put("wechatPay", "微信支付"); PAY_TYPE_MAPPING.put("alipayPay", "支付宝支付"); - PAY_TYPE_MAPPING.put("mainScanPay", "主扫支付"); - PAY_TYPE_MAPPING.put("backScanPay", "被扫支付"); - PAY_TYPE_MAPPING.put("creditPay", "信用支付"); + PAY_TYPE_MAPPING.put("mainScanPay", "被扫支付"); + PAY_TYPE_MAPPING.put("backScanPay", "主扫支付"); + + PAY_TYPE_MAPPING.put("memberPay", "余额支付"); + PAY_TYPE_MAPPING.put("creditPay", "挂账支付"); } diff --git a/cash-service/system-service/src/main/java/com/czg/service/system/service/impl/SysParamsServiceImpl.java b/cash-service/system-service/src/main/java/com/czg/service/system/service/impl/SysParamsServiceImpl.java index 47ad6b69f..cd97e8a27 100644 --- a/cash-service/system-service/src/main/java/com/czg/service/system/service/impl/SysParamsServiceImpl.java +++ b/cash-service/system-service/src/main/java/com/czg/service/system/service/impl/SysParamsServiceImpl.java @@ -112,9 +112,14 @@ public class SysParamsServiceImpl extends ServiceImpl Date: Tue, 25 Nov 2025 10:28:36 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=96=B0=E5=AE=A2=E7=AB=8B=E5=87=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../czg/service/order/service/impl/OrderInfoServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java index 142282da7..ac9b2db71 100644 --- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java +++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/OrderInfoServiceImpl.java @@ -1488,7 +1488,7 @@ public class OrderInfoServiceImpl extends ServiceImpl 0) { From eaac56dd8efa01fb4f5b63e178f4a0d90303eeb9 Mon Sep 17 00:00:00 2001 From: wangw <1594593906@qq.com> Date: Tue, 25 Nov 2025 11:10:32 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E7=94=A8=E6=88=B7=20=E4=BA=8C=E7=BB=B4?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../czg/account/service/UserInfoService.java | 1 + .../com/czg/order/vo/ProductCostAmountVO.java | 22 ++++++++++++++++ .../impl/UserAuthorizationServiceImpl.java | 22 +--------------- .../service/impl/UserInfoServiceImpl.java | 25 ++++++++++++++++++- 4 files changed, 48 insertions(+), 22 deletions(-) create mode 100644 cash-common/cash-common-service/src/main/java/com/czg/order/vo/ProductCostAmountVO.java diff --git a/cash-common/cash-common-service/src/main/java/com/czg/account/service/UserInfoService.java b/cash-common/cash-common-service/src/main/java/com/czg/account/service/UserInfoService.java index 1241e6c16..f048f07ca 100644 --- a/cash-common/cash-common-service/src/main/java/com/czg/account/service/UserInfoService.java +++ b/cash-common/cash-common-service/src/main/java/com/czg/account/service/UserInfoService.java @@ -27,4 +27,5 @@ public interface UserInfoService extends IService { void updateDistributionAmount(long userId, BigDecimal amount); + void initAc(UserInfo userInfo); } diff --git a/cash-common/cash-common-service/src/main/java/com/czg/order/vo/ProductCostAmountVO.java b/cash-common/cash-common-service/src/main/java/com/czg/order/vo/ProductCostAmountVO.java new file mode 100644 index 000000000..e718bc631 --- /dev/null +++ b/cash-common/cash-common-service/src/main/java/com/czg/order/vo/ProductCostAmountVO.java @@ -0,0 +1,22 @@ +package com.czg.order.vo; + +import lombok.Data; + +import java.math.BigDecimal; + +/** + * 用于获取 商品成本价 + * + * @author ww + * @description + */ +@Data +public class ProductCostAmountVO { + private Long productId; + private Long skuId; + //向上取整 保留两位小数 + private BigDecimal costAmount; + + private Long count; + private BigDecimal totalCostAmount; +} diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/UserAuthorizationServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/UserAuthorizationServiceImpl.java index e6ac73317..664ae2769 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/UserAuthorizationServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/UserAuthorizationServiceImpl.java @@ -36,8 +36,6 @@ public class UserAuthorizationServiceImpl implements UserAuthorizationService { @Resource private WechatAuthUtil wechatAuthUtil; @Resource - private AcAccountUtil acAccountUtil; - @Resource private AlipayUtil alipayUtil; @Resource private UserInfoService userInfoService; @@ -121,28 +119,10 @@ public class UserAuthorizationServiceImpl implements UserAuthorizationService { userInfo.setLastLoginTime(DateUtil.date().toLocalDateTime()); userInfoService.saveOrUpdate(userInfo); - initAc(userInfo); + userInfoService.initAc(userInfo); // StpKit.USER.login(userInfo.getId()); StpKit.USER.login(userInfo.getId(), openId, null, null, null, MyStpLogic.LoginType.USER, false, "userMini", false); String followIndex = paramsService.getSysParamValue(SysParamCodeEnum.FOLLOW_INDEX.getCode()); return new LoginTokenDTO(StpKit.USER.getTokenValue(), followIndex, userInfo); } - - /** - * 初始化用户微信公众号二维码\ - */ - private void initAc(UserInfo userInfo) { - if (userInfo.getIsAc() == null) { - userInfo.setIsAc(0); - } - if (userInfo.getIsAc() == 0 && - (StrUtil.isBlank(userInfo.getWechatAcQrcode()) || userInfo.getAcQrcodeValidTime() == null || userInfo.getAcQrcodeValidTime().isBefore(LocalDateTime.now()))) { - String qrCode = acAccountUtil.createQrCode(userInfo.getId()); - if (StrUtil.isNotBlank(qrCode)) { - userInfo.setWechatAcQrcode(qrCode); - userInfo.setAcQrcodeValidTime(LocalDateTime.now().plusDays(29)); - userInfoService.updateById(userInfo); - } - } - } } diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/UserInfoServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/UserInfoServiceImpl.java index 6cf8a5c9a..a469d4485 100644 --- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/UserInfoServiceImpl.java +++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/UserInfoServiceImpl.java @@ -16,6 +16,7 @@ import com.czg.exception.CzgException; import com.czg.service.RedisService; import com.czg.service.account.mapper.ShopUserMapper; import com.czg.service.account.mapper.UserInfoMapper; +import com.czg.service.account.util.AcAccountUtil; import com.czg.system.service.SmsService; import com.mybatisflex.core.query.QueryWrapper; import com.mybatisflex.spring.service.impl.ServiceImpl; @@ -24,6 +25,7 @@ import org.apache.dubbo.config.annotation.DubboReference; import org.apache.dubbo.config.annotation.DubboService; import java.math.BigDecimal; +import java.time.LocalDateTime; /** * 服务层实现。 @@ -37,6 +39,8 @@ public class UserInfoServiceImpl extends ServiceImpl i private ShopUserMapper shopUserMapper; @Resource private RedisService redisService; + @Resource + private AcAccountUtil acAccountUtil; @DubboReference private SmsService smsService; @@ -47,7 +51,7 @@ public class UserInfoServiceImpl extends ServiceImpl i if (userInfo == null) { throw new CzgException("用户信息不存在"); } - + initAc(userInfo); UserInfoAssetsSummaryDTO assetsSummaryDTO = shopUserMapper.selectAssetsSummary(userInfoId); UserInfoDTO userInfoDTO = BeanUtil.copyProperties(userInfo, UserInfoDTO.class); userInfoDTO.setAssetsSummary(assetsSummaryDTO); @@ -106,4 +110,23 @@ public class UserInfoServiceImpl extends ServiceImpl i throw new CzgException("更新分销金额失败"); } } + + /** + * 初始化用户微信公众号二维码\ + */ + @Override + public void initAc(UserInfo userInfo) { + if (userInfo.getIsAc() == null) { + userInfo.setIsAc(0); + } + if (userInfo.getIsAc() == 0 && + (StrUtil.isBlank(userInfo.getWechatAcQrcode()) || userInfo.getAcQrcodeValidTime() == null || userInfo.getAcQrcodeValidTime().isBefore(LocalDateTime.now()))) { + String qrCode = acAccountUtil.createQrCode(userInfo.getId()); + if (StrUtil.isNotBlank(qrCode)) { + userInfo.setWechatAcQrcode(qrCode); + userInfo.setAcQrcodeValidTime(LocalDateTime.now().plusDays(29)); + updateById(userInfo); + } + } + } }