Browse Source

小程序查看物流、支付配置后端修改

hyq 6 years ago
parent
commit
87e3a3ab9d

+ 2 - 2
kmall-admin/src/main/resources/conf/wx-mp.properties

@@ -8,11 +8,11 @@ pay.wx.env = "dev"
 #小程序ID
 wx.dev.appId=wx0686d352293be639
 #小程序密钥
-wx.dev.secret=52776df5276aa5f334d0cad3f60e8fba
+wx.dev.secret=41d2123d92a15bcdcd589b4695e86701
 #商户号
 wx.dev.mchId=1517534731
 #支付签名
-wx.dev.paySignKey=
+wx.dev.paySignKey=U5XYsGSLMhhNFDBUWfgPGLsF3rG7GTXq
 #交易类型
 wx.dev.tradeType=JSAPI
 #证书名称,对应不同的商户号

+ 2 - 2
kmall-api/src/main/java/com/kmall/api/api/ApiOrderController.java

@@ -317,8 +317,8 @@ public class ApiOrderController extends ApiBaseAction {
             }
         }
         map.put("TracesList",wuliuList);
-        map.put("LogisticCode", "1171986856515");
-        map.put("ShipperCode", "EMS");
+        map.put("LogisticCode", orderInfo.getShipping_no());
+        map.put("ShipperCode",  orderInfo.getShipping_code());
         resultObj.put("wuliu", map);
         return toResponsSuccess(resultObj);
     }

+ 1 - 4
kmall-api/src/main/java/com/kmall/api/api/ApiPayController.java

@@ -142,11 +142,8 @@ public class ApiPayController extends ApiBaseAction {
             String return_msg = MapUtils.getString("return_msg", resultUn);
             //
             if (return_code.equalsIgnoreCase("FAIL")) {
-                apiPayService.payPrepay(resultObj, resultUn, nonceStr, orderVoList);
-
                 updateFailProcessBatch(processRecordEntityList, "支付失败," +return_msg);//更新订单流转信息
-                return toResponsObject(0, "微信统一订单下单成功", resultObj);
-//                return toResponsFail("支付失败," + return_msg);
+                return toResponsFail("支付失败," + return_msg);
             } else if (return_code.equalsIgnoreCase("SUCCESS")) {
                 // 返回数据
                 String result_code = MapUtils.getString("result_code", resultUn);