java110 лет назад: 5
Родитель
Сommit
fee03f5c56

+ 1 - 1
service-front/src/main/java/com/java110/front/smo/AppAbstractComponentSMO.java

@@ -86,11 +86,11 @@ public abstract class AppAbstractComponentSMO extends AbstractComponentSMO {
             if (WechatAuthProperties.TRADE_TYPE_JSAPI.equals(tradeType)) {
             if (WechatAuthProperties.TRADE_TYPE_JSAPI.equals(tradeType)) {
 
 
                 resultMap.put("appId", smallWeChatDto.getAppId());
                 resultMap.put("appId", smallWeChatDto.getAppId());
-                resultMap.put("sign", PayUtil.createSign(resultMap, smallWeChatDto.getPayPassword()));
                 resultMap.put("timeStamp", PayUtil.getCurrentTimeStamp());
                 resultMap.put("timeStamp", PayUtil.getCurrentTimeStamp());
                 resultMap.put("nonceStr", PayUtil.makeUUID(32));
                 resultMap.put("nonceStr", PayUtil.makeUUID(32));
                 resultMap.put("package", "prepay_id=" + resMap.get("prepay_id"));
                 resultMap.put("package", "prepay_id=" + resMap.get("prepay_id"));
                 resultMap.put("signType", "MD5");
                 resultMap.put("signType", "MD5");
+                resultMap.put("sign", PayUtil.createSign(resultMap, smallWeChatDto.getPayPassword()));
             } else if (WechatAuthProperties.TRADE_TYPE_APP.equals(tradeType)) {
             } else if (WechatAuthProperties.TRADE_TYPE_APP.equals(tradeType)) {
                 resultMap.put("appId", smallWeChatDto.getAppId());
                 resultMap.put("appId", smallWeChatDto.getAppId());
                 resultMap.put("timeStamp", PayUtil.getCurrentTimeStamp());
                 resultMap.put("timeStamp", PayUtil.getCurrentTimeStamp());

+ 2 - 2
service-front/src/main/java/com/java110/front/smo/payment/impl/ToPayTempCarInoutSMOImpl.java

@@ -92,8 +92,8 @@ public class ToPayTempCarInoutSMOImpl extends AppAbstractComponentSMO implements
         JSONObject realUserInfo = userResult.getJSONArray("users").getJSONObject(0);
         JSONObject realUserInfo = userResult.getJSONArray("users").getJSONObject(0);
 
 
         String openId = realUserInfo.getString("openId");
         String openId = realUserInfo.getString("openId");
-        String payAppId = orderInfo.getString("payAppId");
-        String payMchId = orderInfo.getString("payMchId");
+//        String payAppId = orderInfo.getString("payAppId");
+//        String payMchId = orderInfo.getString("payMchId");
 
 
         //微信下单PayUtil
         //微信下单PayUtil
         Map result = super.java110Payment(restTemplate,paramIn.getString("feeName"),paramIn.getString("tradeType"),
         Map result = super.java110Payment(restTemplate,paramIn.getString("feeName"),paramIn.getString("tradeType"),