dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

10.8

Browse Source
This commit is contained in:
cun-nan 2024-10-08 11:13:18 +08:00
parent 1bc439ec54
commit cd15a2cf0b
3 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java
View File

@ -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("验签失败，请联系管理员!");

15
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/entity/OilOrder.java
View File

@ -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;

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java
View File

@ -1773,6 +1773,8 @@ public class OilOrderServiceImpl extends ServiceImpl<OilOrderMapper, OilOrder> 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();
}