diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/car/pay/WxCarPaidCallBackController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/car/pay/WxCarPaidCallBackController.java index 163b12fdc..17c79354f 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/car/pay/WxCarPaidCallBackController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/car/pay/WxCarPaidCallBackController.java @@ -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 _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) { diff --git a/mallinkMQConsumer/src/main/java/com/iformall/controller/HomeController.java b/mallinkMQConsumer/src/main/java/com/iformall/controller/HomeController.java index 4d19df045..1563e7a7d 100644 --- a/mallinkMQConsumer/src/main/java/com/iformall/controller/HomeController.java +++ b/mallinkMQConsumer/src/main/java/com/iformall/controller/HomeController.java @@ -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 = "SUCCESS"; -// wxRefundOrderService.notify(WxPayment.xmlToMap(json), EnumPayWay.getEnum(EnumPayWay.PAY_WAY_WECHAT.getCode())); +// //String json = "SUCCESS"; +// //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 paramMap = JSON.parseObject(msg, Map.class); +// wxParkPayService.handlePaidCallBack("789",paramMap); // return new ResultData(version); // } diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/fute/FuteParkService.java b/mallinkService/src/main/java/com/iformall/service/park/impl/fute/FuteParkService.java index 5675d24e3..264ce9007 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/impl/fute/FuteParkService.java +++ b/mallinkService/src/main/java/com/iformall/service/park/impl/fute/FuteParkService.java @@ -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;