fixed 会员储值开关判断优化

fuint-application/src/main/java/com/fuint/common/service/impl/OrderServiceImpl.java

@@ -2288,6 +2288,9 @@ public class OrderServiceImpl extends ServiceImpl<MtOrderMapper, MtOrder> implem
         String ruleParam = "";
         MtSetting mtSetting = settingService.querySettingByName(merchantId, SettingTypeEnum.BALANCE.getKey(), BalanceSettingEnum.RECHARGE_RULE.getKey());
         if (StringUtil.isNotEmpty(rechargeAmount) && mtSetting != null) {
+            if (!mtSetting.getStatus().equals(StatusEnum.ENABLED.getKey())) {
+                throw new BusinessCheckException("当前未开启充值功能");
+            }
             if (mtSetting.getValue() != null && StringUtil.isNotEmpty(mtSetting.getValue())) {
                 String rules[] = mtSetting.getValue().split(",");
                 for (String rule : rules) {

fuint-application/src/main/java/com/fuint/common/service/impl/WeixinServiceImpl.java

@@ -1329,8 +1329,8 @@ public class WeixinServiceImpl implements WeixinService {
                    .domain(wxPayBean.getDomain())
                    .build();
 
-        // 微信内h5公众号支付或PC收银
-        if (platform.equals(PlatformTypeEnum.H5.getCode()) || platform.equals(PlatformTypeEnum.PC.getCode())) {
+        // 微信内h5公众号支付
+        if (platform.equals(PlatformTypeEnum.H5.getCode())) {
             String wxAppId = env.getProperty("weixin.official.appId");
             String wxAppSecret = env.getProperty("weixin.official.appSecret");
 

fuint-repository/src/main/resources/mapper/MtSettingMapper.xml

@@ -2,7 +2,7 @@
 <!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
 <mapper namespace="com.fuint.repository.mapper.MtSettingMapper">
     <select id="querySettingByType" resultType="com.fuint.repository.model.MtSetting">
-        select * from mt_setting t where t.TYPE = #{type} and t.MERCHANT_ID = #{merchantId} and t.status='A'
+        select * from mt_setting t where t.TYPE = #{type} and t.MERCHANT_ID = #{merchantId} and t.status != 'D'
     </select>
 
     <select id="querySettingByName" resultType="com.fuint.repository.model.MtSetting">
@@ -10,6 +10,6 @@
         <if test="storeId != null and storeId > 0">
           AND (t.STORE_ID = #{storeId} OR t.STORE_ID = 0)
         </if>
-          AND t.STATUS='A' LIMIT 1
+          AND t.STATUS != 'D' LIMIT 1
     </select>
 </mapper>