新增微信国际配置

kmall-admin/src/main/resources/conf/db.properties

@@ -47,3 +47,46 @@ jdbc.validationTimeout=4000
 #jdbc.connectionTimeout=5000
 #jdbc.maximumPoolSize=5
 #jdbc.validationTimeout=4000
+
+
+###========== 中网国际数据库开发环境 ==========
+#jdbc.url=jdbc:mysql://120.76.84.45:3306/kmall_pt_global?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
+#jdbc.username=tuser
+#jdbc.password=Qq!123
+#
+#jdbc.initialSize=5
+#jdbc.maxActive=30
+#
+#jdbc.minPoolSize=2+
+#jdbc.maxIdleTime=30000
+#jdbc.idleConnectionTestPeriod=100
+#
+##---------- for hikari
+#jdbc.driver=org.mariadb.jdbc.Driver
+#jdbc.idleTimeout=400000
+#jdbc.maxLifetime=500000
+#jdbc.connectionTimeout=5000
+#jdbc.maximumPoolSize=5
+#jdbc.validationTimeout=4000
+
+
+###========== 中网国际数据库生产环境 ==========
+##阿里云外网地址
+#jdbc.url=jdbc:mysql://out-rm-wz9rps8173a1nx63gio.mysql.rds.aliyuncs.com:3306/kmall_pt_global?allowMultiQueries=true&useUnicode=true&characterEncoding=UTF-8
+#jdbc.username=kmall_pt
+#jdbc.password=AFnwRBu!3q
+#
+#jdbc.initialSize=5
+#jdbc.maxActive=30
+#
+#jdbc.minPoolSize=2
+#jdbc.maxIdleTime=30000
+#jdbc.idleConnectionTestPeriod=100
+#
+##---------- for hikari
+#jdbc.driver=org.mariadb.jdbc.Driver
+#jdbc.idleTimeout=400000
+#jdbc.maxLifetime=500000
+#jdbc.connectionTimeout=5000
+#jdbc.maximumPoolSize=5
+#jdbc.validationTimeout=4000

kmall-admin/src/main/resources/conf/redis.properties

@@ -13,7 +13,7 @@ redis.dev.pool.maxTotal=10000
 redis.dev.pool.testOnBorrow=true
 
 
-# 生产环境
+# 中网生产环境
 redis.prod.keyPrefix=platform
 redis.prod.host=183.3.221.143
 redis.prod.port=6379
@@ -21,3 +21,12 @@ redis.prod.pool.maxIdle=200
 redis.prod.pool.maxWait=1000
 redis.prod.pool.maxTotal=10000
 redis.prod.pool.testOnBorrow=true
+
+## 中网国际生产环境
+#redis.prod.keyPrefix=platform
+#redis.prod.host=183.62.225.124
+#redis.prod.port=6379
+#redis.prod.pool.maxIdle=200
+#redis.prod.pool.maxWait=1000
+#redis.prod.pool.maxTotal=10000
+#redis.prod.pool.testOnBorrow=true

kmall-api/src/main/java/com/kmall/api/api/ApiCouponController.java

@@ -151,8 +151,8 @@ public class ApiCouponController extends ApiBaseAction {
         //
         String phone = jsonParam.getString("phone");
         String smscode = jsonParam.getString("smscode");
-        UserVo userVo = apiUserService.queryByMobile(phone);
-        if(userVo != null){
+        List<UserVo> userVoList = apiUserService.queryByMobile(phone);
+        if(userVoList != null && userVoList.size() > 0){
             return toResponsFail("该手机号已绑定");
         }
         // 校验短信码

kmall-api/src/main/java/com/kmall/api/api/ApiUserController.java

@@ -39,7 +39,7 @@ public class ApiUserController extends ApiBaseAction {
 
     /**
      */
-    @IgnoreAuth
+    /*@IgnoreAuth
     @GetMapping("info")
     public Object info(String mobile) {
         Map param = new HashMap();
@@ -47,7 +47,7 @@ public class ApiUserController extends ApiBaseAction {
         UserVo user = userService.queryByMobile(mobile);
         user.setPassword("");
         return user;
-    }
+    }*/
 
     /**
      * 发送短信
@@ -81,6 +81,8 @@ public class ApiUserController extends ApiBaseAction {
                 smsLog.setSendStatus(1);
                 smsLog.setSendId(vo.getSid());
                 smsLog.setReturnMsg(vo.getMsg());
+                smsLog.setMerchSn(getMerchSn());
+                smsLog.setStoreId(getStoreId().intValue());
 
                 SysSmsLogEntity sysSmsLogEntity = smsLogService.sendSms(smsLog);
                 if (null == sysSmsLogEntity) {

kmall-api/src/main/java/com/kmall/api/dao/ApiUserMapper.java

@@ -6,6 +6,8 @@ import org.apache.ibatis.annotations.Param;
 import com.kmall.common.dao.BaseDao;
 import org.springframework.stereotype.Component;
 
+import java.util.List;
+
 /**
  * 用户
  *
@@ -16,7 +18,7 @@ import org.springframework.stereotype.Component;
 @Component
 public interface ApiUserMapper extends BaseDao<UserVo> {
 
-    UserVo queryByMobile(String mobile);
+    List<UserVo> queryByMobile(String mobile);
 
     UserVo queryByOpenId(@Param("openId") String openId);
 

kmall-api/src/main/java/com/kmall/api/service/ApiUserService.java

@@ -65,21 +65,21 @@ public class ApiUserService {
         userDao.deleteBatch(userIds);
     }
 
-    public UserVo queryByMobile(String mobile) {
+    public List<UserVo> queryByMobile(String mobile) {
         return userDao.queryByMobile(mobile);
     }
 
-    public long login(String mobile, String password) {
-        UserVo user = queryByMobile(mobile);
-        Assert.isNull(user, "手机号或密码错误");
-
-        //密码错误
-        if (!user.getPassword().equals(DigestUtils.sha256Hex(password))) {
-            throw new RRException("手机号或密码错误");
-        }
-
-        return user.getId();
-    }
+//    public long login(String mobile, String password) {
+//        UserVo user = queryByMobile(mobile);
+//        Assert.isNull(user, "手机号或密码错误");
+//
+//        //密码错误
+//        if (!user.getPassword().equals(DigestUtils.sha256Hex(password))) {
+//            throw new RRException("手机号或密码错误");
+//        }
+//
+//        return user.getId();
+//    }
 
     public SmsLogVo querySmsCodeByUserId(Long user_id) {
         return userDao.querySmsCodeByUserId(user_id);

kmall-api/src/main/java/com/kmall/api/util/ApiUserUtils.java

@@ -1,6 +1,7 @@
 package com.kmall.api.util;
 
 import com.kmall.api.service.pay.wxpay.WxPayPropertiesBuilder;
+import com.kmall.common.service.pay.global.CommonWxGlobalPayPropertiesBuilder;
 
 /**
  * 作者: @author Scott <br>
@@ -11,25 +12,30 @@ public class ApiUserUtils {
 
     //替换字符串
     public static String getCode(String APPID, String REDIRECT_URI, String SCOPE) {
-        //return String.format(ResourceUtil.getConfigByName("wx.getCode"), APPID, REDIRECT_URI, SCOPE);
         return String.format(WxPayPropertiesBuilder.instance().getGetCode(), APPID, REDIRECT_URI, SCOPE);
+//        return String.format(CommonWxGlobalPayPropertiesBuilder.instance().getGetCode(), APPID, REDIRECT_URI, SCOPE);
     }
 
     //替换字符串
     public static String getWebAccess(String CODE) {
         return String.format(
-                //ResourceUtil.getConfigByName("wx.webAccessTokenhttps"),
                 WxPayPropertiesBuilder.instance().getWebAccessTokenhttps(),
-                //ResourceUtil.getConfigByName("wx.appId"),
                 WxPayPropertiesBuilder.instance().getAppId(),
-                //ResourceUtil.getConfigByName("wx.secret"),
                 WxPayPropertiesBuilder.instance().getSecret(),
                 CODE);
+//        return String.format(
+//                //ResourceUtil.getConfigByName("wx.webAccessTokenhttps"),
+//                CommonWxGlobalPayPropertiesBuilder.instance().getWebAccessTokenhttps(),
+//                //ResourceUtil.getConfigByName("wx.appId"),
+//                CommonWxGlobalPayPropertiesBuilder.instance().getAppId(),
+//                //ResourceUtil.getConfigByName("wx.secret"),
+//                CommonWxGlobalPayPropertiesBuilder.instance().getSecret(),
+//                CODE);
     }
 
     //替换字符串
     public static String getUserMessage(String access_token, String openid) {
-        //return String.format(ResourceUtil.getConfigByName("wx.userMessage"), access_token, openid);
         return String.format(WxPayPropertiesBuilder.instance().getUserMessage(), access_token, openid);
+//        return String.format(CommonWxGlobalPayPropertiesBuilder.instance().getUserMessage(), access_token, openid);
     }
 }

kmall-api/src/main/resources/mybatis/mapper/ApiUserMapper.xml

@@ -38,6 +38,12 @@
         from mall_user
         where id = #{id}
     </select>
+    <select id="queryByMobile" resultMap="BaseResultMap" >
+        select
+        <include refid="Base_Column_List" />
+        from mall_user
+        where mobile = #{mobile}
+    </select>
 
     <select id="queryObjectByIdNoAndName" resultMap="BaseResultMap" >
         select

kmall-common/src/main/java/com/kmall/common/utils/wechat/WechatConfig.java

@@ -1,5 +1,6 @@
 package com.kmall.common.utils.wechat;
 
+import com.kmall.common.service.pay.global.CommonWxGlobalPayPropertiesBuilder;
 import com.kmall.common.service.pay.wxpay.CommonWxPayPropertiesBuilder;
 import com.kmall.common.utils.ResourceUtil;
 import org.apache.http.conn.ssl.SSLConnectionSocketFactory;
@@ -26,15 +27,16 @@ public class WechatConfig {
         try {
             KeyStore keyStore = KeyStore.getInstance("PKCS12");
             Thread.currentThread().getContextClassLoader();
-//            InputStream instream = new WechatRefundApiResult().getClass().getResourceAsStream(
-//                    CommonWxPayPropertiesBuilder.instance().getCertName());
             InputStream instream = new FileInputStream(CommonWxPayPropertiesBuilder.instance().getCertName());
+//            InputStream instream = new FileInputStream(CommonWxGlobalPayPropertiesBuilder.instance().getCertName());
             try {
                 keyStore.load(instream, CommonWxPayPropertiesBuilder.instance().getMchId().toCharArray());
+//                keyStore.load(instream, CommonWxGlobalPayPropertiesBuilder.instance().getMchId().toCharArray());
             } finally {
                 instream.close();
             }
             SSLContext sslcontext = SSLContexts.custom().loadKeyMaterial(keyStore, CommonWxPayPropertiesBuilder.instance().getMchId().toCharArray()).build();
+//            SSLContext sslcontext = SSLContexts.custom().loadKeyMaterial(keyStore, CommonWxGlobalPayPropertiesBuilder.instance().getMchId().toCharArray()).build();
             sslcsf = new SSLConnectionSocketFactory(sslcontext, new String[]{"TLSv1"}, null, SSLConnectionSocketFactory.BROWSER_COMPATIBLE_HOSTNAME_VERIFIER);
         } catch (Exception e) {
             e.printStackTrace();

kmall-common/src/main/java/com/kmall/common/utils/wechat/wxglobal/WechatGlobalUtil.java

@@ -109,11 +109,12 @@ public class WechatGlobalUtil {
         param.put("mch_id", CommonWxGlobalPayPropertiesBuilder.instance().getMchId());// 商家账号
         String randomStr = CharUtil.getRandomNum(18).toUpperCase();
         param.put("nonce_str", randomStr);// 随机字符串
-        if(StringUtils.isNotEmpty(body)) {
-            param.put("body", body);// 商品描述
-        }else{
-            param.put("body", "中网跨境商城-支付");// 商品描述
-        }
+//        if(StringUtils.isNotEmpty(body)) {
+//            param.put("body", body);// 商品描述
+//        }else{
+//            param.put("body", "中网跨境商城-支付");// 商品描述
+//        }
+        param.put("body", "中网跨境商城-支付");// 商品描述
         param.put("out_trade_no", out_trade_no);// 商户订单编号
         //支付金额
         param.put("total_fee", Math.round(actual_price.multiply(Constant.ONE_HUNDRED).doubleValue()));// 消费金额

wx-mall/pages/auth/newuser/newuser.js

@@ -57,13 +57,8 @@ Page({
           title: '手机号绑定成功'
         });
         wx.redirectTo({ url: '/pages/ucenter/coupon/coupon' });
-      } else if (res.errno === 1) {
+      } else {
         util.showErrorToast(res.errmsg);
-        // wx.showModal({
-        //   title: '提示信息',
-        //   content: res.errmsg,
-        //   showCancel: false
-        // });
       }
     });
   },

wx-mall/pages/shopping/checkout/checkout.js

@@ -301,7 +301,6 @@ Page({
         for (let i = 0; i < res.data.orderInfo.length; i++){
           orderIds[i] = res.data.orderInfo[i].id;
         }
-        wx.hideLoading();
         wx.redirectTo({
           url: '/pages/pay/pay?orderIds=' + orderIds + '&actualPrice=' + actualPrice + '&isMergePay=1'//此处提交支付属于合并支付
         })
@@ -313,6 +312,7 @@ Page({
           showCancel: false
         });
       }
+      wx.hideLoading();
     });
   },
   // 校验门店