From 55c71422fdbd8016ff41cdbf77b4ff33f955059f Mon Sep 17 00:00:00 2001
From: wangw <1594593906@qq.com>
Date: Wed, 19 Mar 2025 15:11:49 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=85=E5=80=BC=E8=B5=A0=E9=80=81=E7=A7=AF?=
 =?UTF-8?q?=E5=88=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../account/service/impl/ShopActivateServiceImpl.java | 11 ++++++-----
 .../service/order/service/impl/PayServiceImpl.java    |  3 ++-
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopActivateServiceImpl.java b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopActivateServiceImpl.java
index ca18e992..6f62889e 100644
--- a/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopActivateServiceImpl.java
+++ b/cash-service/account-service/src/main/java/com/czg/service/account/service/impl/ShopActivateServiceImpl.java
@@ -1,7 +1,6 @@
 package com.czg.service.account.service.impl;
 
 import cn.hutool.core.bean.BeanUtil;
-import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.date.LocalDateTimeUtil;
 import cn.hutool.core.util.ObjectUtil;
 import cn.hutool.core.util.StrUtil;
@@ -13,10 +12,7 @@ import com.czg.account.entity.ShopActivate;
 import com.czg.account.entity.ShopActivateCouponRecord;
 import com.czg.account.entity.ShopCoupon;
 import com.czg.account.entity.ShopUser;
-import com.czg.account.service.ShopActivateCouponRecordService;
-import com.czg.account.service.ShopActivateService;
-import com.czg.account.service.ShopCouponService;
-import com.czg.account.service.ShopUserService;
+import com.czg.account.service.*;
 import com.czg.enums.ShopUserFlowBizEnum;
 import com.czg.sa.StpKit;
 import com.czg.service.account.mapper.ShopActivateMapper;
@@ -50,6 +46,8 @@ public class ShopActivateServiceImpl extends ServiceImpl<ShopActivateMapper, Sho
     private ShopActivateCouponRecordService inRecordService;
     @Resource
     private ShopUserService shopUserService;
+    @Resource
+    private MemberPointsService pointsService;
 
     @Override
     public List<ShopActivateDTO> getList(Long shopId) {
@@ -156,6 +154,9 @@ public class ShopActivateServiceImpl extends ServiceImpl<ShopActivateMapper, Sho
             //更新会员余额 并生成流水
             shopUserService.updateMoney(shopUser.getShopId(), shopUserMoneyEditDTO);
         }
+        if (activate.getGiftPoints() != null && activate.getGiftPoints() > 0) {
+            pointsService.addPoints(shopUser.getId(), activate.getGiftPoints(), "储值赠送积分", null);
+        }
     }
 
     /**
diff --git a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java
index fd06f4c7..23f0fc8b 100644
--- a/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java
+++ b/cash-service/order-service/src/main/java/com/czg/service/order/service/impl/PayServiceImpl.java
@@ -347,7 +347,8 @@ public class PayServiceImpl implements PayService {
         AssertUtil.isNull(shopInfo, "店铺不存在");
         if (shopInfo.getIsMemberInPwd().equals(1)) {
             AssertUtil.isBlank(shopInfo.getOperationPwd(), "请设置操作密码后使用");
-            if (!shopInfo.getOperationPwd().equals(MD5Util.md5AsHex(payParam.getPwd()))) {
+            AssertUtil.isBlank(payParam.getPwd(), "请输入操作密码后充值");
+            if (!shopInfo.getOperationPwd().equals(SecureUtil.md5(payParam.getPwd()))) {
                 return CzgResult.failure("支付密码错误");
             }
         }