From cd15a2cf0be794ed984fe6a156d4dcdd6eca9ba8 Mon Sep 17 00:00:00 2001 From: cun-nan <19819293608@163.com> Date: Tue, 8 Oct 2024 11:13:18 +0800 Subject: [PATCH] 10.8 --- .../api/fuyou/service/impl/FyPayServiceImpl.java | 2 ++ .../com/fuint/business/order/entity/OilOrder.java | 15 ++++++++++----- .../order/service/impl/OilOrderServiceImpl.java | 2 ++ 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java index 3c28a0eb4..33db6d5bc 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java @@ -582,6 +582,8 @@ public class FyPayServiceImpl implements FyPayService { res.put("data", returnParameter); res.put("resultMsg", resMap.get("result_msg")); + res.put("mchntCd", merchantConfig.getMchntCd()); + res.put("paymentChannel", merchantConfig.getPaymentChannel()); return res; } else { throw new Exception("验签失败，请联系管理员!"); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/OilOrder.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/OilOrder.java index e69864bd6..97fd89990 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/OilOrder.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/OilOrder.java @@ -126,7 +126,7 @@ public class OilOrder extends BaseEntity implements Serializable { /** * 支付时间 */ - @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") private Date payTime; /** * 富友订单号 @@ -150,17 +150,22 @@ public class OilOrder extends BaseEntity implements Serializable { */ // @TableField(exist = false) private Integer tankId; - @TableField(exist = false) + /** + * 商户号 + */ + private String mchntCd; + /** + * 支付通道 + */ + private String paymentChannel; + @TableField(exist = false) private String tankName; @TableField(exist = false) - private String gunName; @TableField(exist = false) - private String oilName; @TableField(exist = false) - private String StoreName; @TableField(exist = false) private Long deptId; diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java index e1fe1dac8..ebae65108 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java @@ -1773,6 +1773,8 @@ public class OilOrderServiceImpl extends ServiceImpl i // applet = fyPayService.applet(receiveParameter); // } applet.put("orderNo", orderNo); + oilOrder.setMchntCd(applet.get("mchntCd").toString()); + oilOrder.setPaymentChannel(applet.get("paymentChannel").toString()); } catch (Exception e) { e.printStackTrace(); }