|
@@ -63,13 +63,13 @@ public class WechatPayService {
|
|
Integer orderType = null;
|
|
Integer orderType = null;
|
|
if(repair.getStatus() == 9){
|
|
if(repair.getStatus() == 9){
|
|
amount = priceListService.getAmountByRepairId(param.getRepairId());
|
|
amount = priceListService.getAmountByRepairId(param.getRepairId());
|
|
- orderSn = "sale_"+DateUtil.getDate();
|
|
|
|
|
|
+ orderSn = "se_s_"+DateUtil.getDate(DateUtil.repairIdFmt);
|
|
subject = "维修订单";
|
|
subject = "维修订单";
|
|
orderType = 0;
|
|
orderType = 0;
|
|
}
|
|
}
|
|
if(repair.getStatus() == 3){
|
|
if(repair.getStatus() == 3){
|
|
amount = priceListService.getRobAmountByRepairId(param.getRepairId());
|
|
amount = priceListService.getRobAmountByRepairId(param.getRepairId());
|
|
- orderSn = "sale_cancel_"+DateUtil.getDate();
|
|
|
|
|
|
+ orderSn = "se_c"+DateUtil.getDate(DateUtil.repairIdFmt);
|
|
subject = "取消维修订单";
|
|
subject = "取消维修订单";
|
|
orderType = 1;
|
|
orderType = 1;
|
|
}
|
|
}
|
|
@@ -105,7 +105,6 @@ public class WechatPayService {
|
|
|
|
|
|
String mweb_url = "";
|
|
String mweb_url = "";
|
|
Map<String, String> resp = WXPay.unifiedOrder(data);
|
|
Map<String, String> resp = WXPay.unifiedOrder(data);
|
|
- log.warn("wechatH5Pay" + resp);
|
|
|
|
String return_code = resp.get("return_code");
|
|
String return_code = resp.get("return_code");
|
|
String return_msg = resp.get("return_msg");
|
|
String return_msg = resp.get("return_msg");
|
|
if ("SUCCESS".equals(return_code) && "OK".equals(return_msg)) {
|
|
if ("SUCCESS".equals(return_code) && "OK".equals(return_msg)) {
|
|
@@ -113,7 +112,7 @@ public class WechatPayService {
|
|
mweb_url += "&redirect_url=" + URLEncoder.encode(CacheUtil.mainUrl + WXPayDefaultConfig.h5RedirectURL, "UTF-8");
|
|
mweb_url += "&redirect_url=" + URLEncoder.encode(CacheUtil.mainUrl + WXPayDefaultConfig.h5RedirectURL, "UTF-8");
|
|
log.warn("mweb_url=" + mweb_url);
|
|
log.warn("mweb_url=" + mweb_url);
|
|
} else {
|
|
} else {
|
|
- log.error("微信统一支付接口获取预支付订单出错");
|
|
|
|
|
|
+ log.error("微信统一支付接口获取预支付订单出错",resp);
|
|
}
|
|
}
|
|
JSONObject j = new JSONObject();
|
|
JSONObject j = new JSONObject();
|
|
j.put("mweb_url", mweb_url);
|
|
j.put("mweb_url", mweb_url);
|