Merge branch 'dev' into 'mp-server-test'

支付宝支付

See merge request quanshu/mp-server!813

mp-service/src/main/java/com/qs/mp/pay/service/impl/WalletServiceImpl.java

@@ -98,7 +98,7 @@ public class WalletServiceImpl implements IWalletService {
     String appId = aliMiniAppAppId;
     String payShopNo = userPayShopNo;
     String paySign = userPaySign;
-    JSONObject params = buildPayOrderReqData(payShopNo, paySign, money, openId, appId, orderRemark, "1", "1019");
+    JSONObject params = buildPayOrderReqData(payShopNo, paySign, money, openId, appId, orderRemark, "1", "1014");
     String result = OkHttpUtil.postJsonParams(reqUrl, params.toJSONString());
     logger.info("request params:" + params.toJSONString() + "  result:" + result);
     if (StringUtils.isBlank(result)) {