other_project/mallplus
7
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

支付相关配置

Browse Source
This commit is contained in:
dimengzhe
2023-03-02 18:02:59 +08:00
parent 4388b948ba
commit 1022c3ba03
3 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
mallplus-portal/src/main/java/com/zscat/mallplus/oms/service/impl/OmsOrderServiceImpl.java
View File

@@ -1400,15 +1400,16 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
@Transactional
public boolean closeOrder(OmsOrder order) {
releaseStock(order);
// order.setStatus(OrderStatus.CLOSED.getValue());
order.setStatus(OrderStatus.DELETED.getValue());
order.setStatus(OrderStatus.CLOSED.getValue());
// order.setStatus(OrderStatus.DELETED.getValue());
OmsOrderOperateHistory history = new OmsOrderOperateHistory();
history.setOrderId(order.getId());
history.setCreateTime(new Date());
history.setOperateMan("shop");
history.setPreStatus(OrderStatus.INIT.getValue());
history.setOrderStatus(OrderStatus.DELETED.getValue());
// history.setPreStatus(OrderStatus.INIT.getValue());
history.setPreStatus(OrderStatus.CLOSED.getValue());
history.setOrderStatus(OrderStatus.CLOSED.getValue());
history.setNote("取消订单");
orderOperateHistoryService.save(history);
@@ -1426,7 +1427,8 @@ public class OmsOrderServiceImpl extends ServiceImpl<OmsOrderMapper, OmsOrder> i
if (order.getStatus() != OrderStatus.DELIVERED.getValue()) {
return new CommonResult().paramFailed("已发货订单才能确认收货");
}
OmsOrderOperateHistory history = updateOrderInfo(id, order, OrderStatus.TO_COMMENT);
// OmsOrderOperateHistory history = updateOrderInfo(id, order, OrderStatus.TO_COMMENT);
OmsOrderOperateHistory history = updateOrderInfo(id, order, OrderStatus.TRADE_SUCCESS);
history.setNote("确认收货");
orderOperateHistoryService.save(history);

8
mallplus-portal/src/main/resources/application-dev.properties
View File

@@ -57,14 +57,14 @@ spring.redis.pool.min-idle=0
spring.redis.timeout=0
#===redis end===
# \u5C0F\u7A0B\u5E8F
wx.domain=http://192.168.1.107:8111/api
wx.domain=http://2wsiyd.natappfree.cc/api
wx.secret=381f9ea3359c0e2fc8b74c59d9d9bb11
wx.appId=wxa66597d50184d027
wx.mchId=1513840821
wx.paySignKey=
wx.certName=/cert/apiclient_cert.p12
wx.getCode=https://open.weixin.qq.com/connect/oauth2/authorize?appid=%s&redirect_uri=%s&response_type=code&scope=%s&state=STAT#wechat_redirect
wx.notifyUrl=http://192.168.1.107:8111/api/pay/notify
wx.notifyUrl=http://2wsiyd.natappfree.cc/api/pay/notify
wx.orderquery=https://api.mch.weixin.qq.com/pay/orderquery
wx.refundUrl=https://api.mch.weixin.qq.com/secapi/pay/refund
wx.refundqueryUrl=https://api.mch.weixin.qq.com/pay/refundquery
@@ -92,9 +92,9 @@ logistics.Kdniao.ReqURL=http://sandboxapi.kdniao.com:8080/kdniaosandbox/gateway/
alipay.appId=2018082761134635
alipay.privateKey=MIIEvAIBADANBgkqhkiG9w0BAQEFAASCBKYwggSiAgEAAoIBAQCpYi38h2/25e4mNWo56mmwuwa7QbBbPdgH00rsmPI/+0JkYhda2uZDvtrFXWMLzVJ2ioh9pamcfUbb2LcFgLIJ0KJyTia4sVMHmbk9l8wPf9mE4aOYN8ix6olzkm9ZhDGVekx2niW/hf6bpjnh92+I4EZo4xsK3RAsQ9oDXPjrJzktrrerAP+5MNOY8wLRqOp0KU+bOIcsz4Wz+qD3UxP2PjXPJDvXu7NkYDndOc7G0tVnhzVahFafqAntbgQHMyJENhLl9xdbnYdiKQqZJUwfI9xlRKYk08P4YVYTL7dAGAibQJJamgqmmKo8uibDIMkLsTGNm5WzW3EErWOCl6wlAgMBAAECggEAXfyxgbdxRDHPlHn9KIfO/5a3pH5NqkNFtQnkQCaZ/TChZWwcg3iFXr/vSqaICAt1H3u9QuMCm2fUQrcczzvbDqErEnwU9lTGuqfs5qVtQIhznU1K5nLFtRtsC6oMiUJV9Rh4hzU3wu9KGPoCkkUnKW8xApBJ+Bw0FivMNCOJp4kipif0gXQFxDH14w8n4QAyG3keXYP43DPqlsjmjJm4inHajxNO012Snle5SqA5HaIrZzf9St3ctq1BzqgUaD5yyXPmPyi1sqjrK+A16R4DrbKlY2h3/mo1IIfPjYbjb/uPcHf9pDMxEFwYIZ+kkz0uUjRDNWVX3A7ldav8MvvZ/QKBgQDot2raw93blrEhld3GGY4JNxboi6UZ1guK2nDEjlnpZjDUklSlNsx82NM8g0bm76Q9A3WpuoHQoSGEIy9ElrMuNS7xj+PZe5mNyKFMBG8hKeIV3jx4OIU80aiV9OQLv6+AonavHvOLXu41OJKdoQexyz7q3lu0+i7d9KKbWd2SlwKBgQC6VJxj1KPh3kHtmm/d/5fOZUDLqxTOyexRrEUCj9hGjv5XymxULQPskKxasFKiPyn4TCp2ZOrPO1slu8IUpzaymM4DDQYtTQkbsAT/N6r9efCJTXDdTgm5iyTaILbSbqd01KEnqjmFLOSCpasvM47rARlG4IYXIXD9cXKj12AaowKBgAN7w2C079w6nDopeSFe/o5KwdAHTxhc6N1SOb/ndZcVzYNREW1LrbHsuPS97lDEo4u6Qoeg4BKUZuEIecuoCdSWPTamdb2qqPjDWQ6/Pj6b1uOG6RbPmcb4SHK+MK+wVdsyE165suGSMTSgvSkY4PmbVjzDyVGjMRJneAulQ7jPAoGAViCIDWkbu2q1xLNPJClhrSiGU94nhxI05uefGnkM+khcbo4Flr8cAjw5Ps4j1BUoPDpQolsxYkrIbd+k7VEBanpRN33MriHepOqu1J2RrwqvUXf3RIQu4JHdnenjN8+oHcuvFhuL7O/8TBtxziah2CSw318m/AgcJzpKSEtkg8sCgYB/cr6PuuQ7JpK2kYmwYMSwNvys0v31iSqFmJK6EyPRycGw9Wj/ANiGJrKuVqdnzb2LqSzdNWkKte25hSIv21satgHM2of7oFzjFB2N/hMx5o+nOQgq0zZcA6Mvn0W3GFFZ1YAep3oyrxLh9+5ELi2JGXgJafiEJvr5J3YzSGOWrw==
alipay.serverUrl=https://openapi.alipay.com/gateway.do
alipay.domain=http://xj6j3w.natappfree.cc/api
alipay.domain=http://2wsiyd.natappfree.cc/api
#回调地址
alipay.notifyUrl=http://xj6j3w.natappfree.cc/api/aliPay/notify_url
alipay.notifyUrl=http://2wsiyd.natappfree.cc/api/aliPay/notify_url
# 支付宝CA根证书文件路径（alipay_root_cert_path 文件绝对路径）
alipay.RootCertPath=D:\\apliay\\alipayRootCert.crt
# 支付宝公钥证书文件路径（alipay_cert_path 文件绝对路径）