Przeglądaj źródła

fix car pay

release_toaliyun_real
winter 3 lat temu
rodzic
commit
bee06adc14
3 zmienionych plików z 17 dodań i 4 usunięć
  1. +8
    -1
      mallinkCallback/src/main/java/com/iformall/controller/callback/car/pay/WxCarPaidCallBackController.java
  2. +9
    -2
      mallinkMQConsumer/src/main/java/com/iformall/controller/HomeController.java
  3. +0
    -1
      mallinkService/src/main/java/com/iformall/service/park/impl/fute/FuteParkService.java

+ 8
- 1
mallinkCallback/src/main/java/com/iformall/controller/callback/car/pay/WxCarPaidCallBackController.java Wyświetl plik

@@ -26,6 +26,7 @@ import com.iformall.pay.WxPayment;
import com.iformall.service.*;
import com.iformall.service.park.impl.cyf.CYFUtil;
import com.iformall.service.park.impl.tjd.TJDUtil;
import com.iformall.service.park.pay.WxParkPayService;
import com.iformall.utils.XmlUtil;

import lombok.extern.slf4j.Slf4j;
@@ -87,6 +88,9 @@ public class WxCarPaidCallBackController extends WxParkCallBackBaseController {
@Autowired
private MqBaseProducer mqBaseProducer;
@Autowired
private WxParkPayService wxParkPayService;

/**
* @description 停车费支付成功通知
@@ -119,8 +123,11 @@ public class WxCarPaidCallBackController extends WxParkCallBackBaseController {
refundSuccessMsg.setJsonMsg(jsonMsg);

// response = wxRefundOrderService.notify(paramMap, EnumPayWay.PAY_WAY_WEAPP);
mqBaseProducer.sendMessage(refundSuccessMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode());
//mqBaseProducer.sendMessage(refundSuccessMsg, EnumMsgMqTopic.DEFAULT.getCode(), EnumMsgMqTag.DEFAULT.getCode(), EnumMsgMqKey.DEFAULT.getCode());

Map<String, String> _paramMap = JSON.parseObject(jsonMsg, Map.class);
wxParkPayService.handlePaidCallBack(tenantId,_paramMap);
logger.info("carPaid wxpay, notify success, req : " + xml + ", resp: " + response.toString());
return response;
} catch (BizMessageException e) {


+ 9
- 2
mallinkMQConsumer/src/main/java/com/iformall/controller/HomeController.java Wyświetl plik

@@ -7,6 +7,7 @@ import com.iformall.enums.EnumPayWay;
import com.iformall.pay.WxPayment;
import com.iformall.service.WxCashOutService;
import com.iformall.service.WxRefundOrderService;
import com.iformall.service.park.pay.WxParkPayService;

import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
@@ -35,6 +36,9 @@ public class HomeController {
@Autowired
private WxRefundOrderService wxRefundOrderService;
@Autowired
private WxParkPayService wxParkPayService;

@ApiOperation("获取后端版本号")
@GetMapping("/version")
@@ -45,8 +49,11 @@ public class HomeController {
// @ApiOperation("获取后端版本号")
// @GetMapping("/ttt")
// public ResultData ttttttt() {
// String json = "<xml><return_code>SUCCESS</return_code><appid><![CDATA[wxed2f44705544b892]]></appid><mch_id><![CDATA[1511925291]]></mch_id><sub_appid><![CDATA[wx649b3be73c1afe47]]></sub_appid><sub_mch_id><![CDATA[1513691501]]></sub_mch_id><nonce_str><![CDATA[753fb2d78c9936cf00e380b03f2a2835]]></nonce_str><req_info><![CDATA[Ndaz8Fj4VUkxnD9iQ2ghD0YcMhVA1AojXftGoSJ5pE1ACNrbZJbqjl2CB5WnPADOb//4ZLIxMC4IZ0hzhsNc8JsDGbPKSYlaBI1prdbXr8am9dRqNljP/e4UDbxdAzHz5bdxS1dCgUXv0iN9BuzqVk2rvAtLlnq6RKjwTLOlIUxWXJMvtsCtpXKvcWMxRx+8pn42Barx6B2D0lM+39Vmi/qjZpQMsMdpKvl5DHkRl0QNFyaD1lQF6Ehe3B0gJhvWRI/EUkWw9lt+XPN0O3li9XPqBXTvD8DI/syYB/PtWcuKAYVdcVHzVm0uf2yM4YwDdFHWRezdozoOgeeU85NDpOIoBWLqVjxDu7l18/lb/4TREE+eMcVkVHmbZpMvVpcpszZGqQSCoAlEQLXC3CmLdcYAj/EzK6sYQeJqabcX6HwZzWyNVAJ9DYJquPa3T+ZFpUM5lW657Xj3DxZDwlX7TyWqSammhqWU34MRlEZ4d832pMgiQeGU2HxyKeBvzo6wwIPz0uEeqHyFSmy7x2EWeAb3SzNBkDT8u7XF6gC7zQzwM8+eoSdkjq7XZV/hPd4ZfsD7a8Y19U14KiizsfA6s33sNcKpBefSVLMfX7shFEGubnpY7bGQyPSl/xCmtgtoZlea2G9luLOlLRtppHRPmDhLvBMr8fmZbHKkRvWIO2Ec8WkhQSXKt2b85hrcP+fYx1/3u614GF+k5OSs7bmbSIydoh2L0Eh7SwgtFw8cYiR7BggAWhrHz739vYpHccKaLx+Rh39+GAtWYmzdOMEjBgScEY00lzfbpc1uruaoKDTwqxWCDfm1WFIs6XnWQh3qZCDHG6Qh+38TOtoi/2FJowSDgmZWFHRgxRU/IihUmAOVXQ+xYm76bSaxjA8ITdltiNTInZFTg5OJ3nCj63bvULc0Jf1KeXocHQxJQfNHleOl6GwlOIu91BEjy6Tjt5SJ2GYrTTtfb4FiE6yvvwoX0+598GK3hW81bNbIW2eXQvNAkP8Qk+eHGJmFn88X1lf38VWLChx7TD+RihjX9nS18K1o8lc/5ySR57MDmPcgwLQ=]]></req_info></xml>";
// wxRefundOrderService.notify(WxPayment.xmlToMap(json), EnumPayWay.getEnum(EnumPayWay.PAY_WAY_WECHAT.getCode()));
// //String json = "<xml><return_code>SUCCESS</return_code><appid><![CDATA[wxed2f44705544b892]]></appid><mch_id><![CDATA[1511925291]]></mch_id><sub_appid><![CDATA[wx649b3be73c1afe47]]></sub_appid><sub_mch_id><![CDATA[1513691501]]></sub_mch_id><nonce_str><![CDATA[753fb2d78c9936cf00e380b03f2a2835]]></nonce_str><req_info><![CDATA[Ndaz8Fj4VUkxnD9iQ2ghD0YcMhVA1AojXftGoSJ5pE1ACNrbZJbqjl2CB5WnPADOb//4ZLIxMC4IZ0hzhsNc8JsDGbPKSYlaBI1prdbXr8am9dRqNljP/e4UDbxdAzHz5bdxS1dCgUXv0iN9BuzqVk2rvAtLlnq6RKjwTLOlIUxWXJMvtsCtpXKvcWMxRx+8pn42Barx6B2D0lM+39Vmi/qjZpQMsMdpKvl5DHkRl0QNFyaD1lQF6Ehe3B0gJhvWRI/EUkWw9lt+XPN0O3li9XPqBXTvD8DI/syYB/PtWcuKAYVdcVHzVm0uf2yM4YwDdFHWRezdozoOgeeU85NDpOIoBWLqVjxDu7l18/lb/4TREE+eMcVkVHmbZpMvVpcpszZGqQSCoAlEQLXC3CmLdcYAj/EzK6sYQeJqabcX6HwZzWyNVAJ9DYJquPa3T+ZFpUM5lW657Xj3DxZDwlX7TyWqSammhqWU34MRlEZ4d832pMgiQeGU2HxyKeBvzo6wwIPz0uEeqHyFSmy7x2EWeAb3SzNBkDT8u7XF6gC7zQzwM8+eoSdkjq7XZV/hPd4ZfsD7a8Y19U14KiizsfA6s33sNcKpBefSVLMfX7shFEGubnpY7bGQyPSl/xCmtgtoZlea2G9luLOlLRtppHRPmDhLvBMr8fmZbHKkRvWIO2Ec8WkhQSXKt2b85hrcP+fYx1/3u614GF+k5OSs7bmbSIydoh2L0Eh7SwgtFw8cYiR7BggAWhrHz739vYpHccKaLx+Rh39+GAtWYmzdOMEjBgScEY00lzfbpc1uruaoKDTwqxWCDfm1WFIs6XnWQh3qZCDHG6Qh+38TOtoi/2FJowSDgmZWFHRgxRU/IihUmAOVXQ+xYm76bSaxjA8ITdltiNTInZFTg5OJ3nCj63bvULc0Jf1KeXocHQxJQfNHleOl6GwlOIu91BEjy6Tjt5SJ2GYrTTtfb4FiE6yvvwoX0+598GK3hW81bNbIW2eXQvNAkP8Qk+eHGJmFn88X1lf38VWLChx7TD+RihjX9nS18K1o8lc/5ySR57MDmPcgwLQ=]]></req_info></xml>";
// //wxRefundOrderService.notify(WxPayment.xmlToMap(json), EnumPayWay.getEnum(EnumPayWay.PAY_WAY_WECHAT.getCode()));
// String msg = "{\"transaction_id\":\"4200001795202302181470250683\",\"nonce_str\":\"2f835b728d9d4e9291160aa96559d483\",\"bank_type\":\"CMB_DEBIT\",\"openid\":\"o8iB81ZYqbeokbn5hARt7eTj7xg4\",\"sign\":\"D59A853D7852442C68DE3DE2CEF7895091386E34E70BC3AD377F0A0C21E3EA27\",\"sub_is_subscribe\":\"N\",\"fee_type\":\"CNY\",\"mch_id\":\"1511925291\",\"sub_appid\":\"wx649b3be73c1afe47\",\"sub_mch_id\":\"1602801645\",\"cash_fee\":\"3000\",\"sub_openid\":\"opvcM5IEkl0U5pNiHcN49Ens40jU\",\"out_trade_no\":\"FUTE_786953095252336640\",\"appid\":\"wxed2f44705544b892\",\"total_fee\":\"3000\",\"tenantId\":\"789\",\"trade_type\":\"JSAPI\",\"result_code\":\"SUCCESS\",\"attach\":\"441397811441729536,18600671341,湘HFS270,1645,be9aacaa-9ecf-4056-a431-70ec50de1937\",\"time_end\":\"20230218235734\",\"is_subscribe\":\"Y\",\"return_code\":\"SUCCESS\"}";
// Map<String, String> paramMap = JSON.parseObject(msg, Map.class);
// wxParkPayService.handlePaidCallBack("789",paramMap);
// return new ResultData(version);
// }

+ 0
- 1
mallinkService/src/main/java/com/iformall/service/park/impl/fute/FuteParkService.java Wyświetl plik

@@ -200,7 +200,6 @@ public class FuteParkService extends BaseParkService implements ParkAdapterServi

@Override
public ParkPaidNotifyResult notifyPaid(WxPark park,ParkNotifyPaid notifyPaid) throws Exception {
logger.info(">>>>> fute notifyPaid");
String result = fute.notifyPaid(park, notifyPaid.getParkOrderNo(), notifyPaid.getFee());
if (StringUtils.isBlank(result)) {
return null;


Ładowanie…
Anuluj
Zapisz