xinyin025/smart-admin
1
0
Fork 0
mirror of https://gitee.com/lab1024/smart-admin.git synced 2025-10-02 10:16:38 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

!150 2022-2-09 Carl

Browse Source 
Merge pull request !150 from Admin/sit-Carl-V3
This commit is contained in:
Admin 2022-02-09 09:33:38 +00:00 committed by Gitee
commit 58e7f3301f
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
1 changed files with 39 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
smart-admin-service/smart-admin-api/src/main/java/net/lab1024/smartadmin/module/system/wxpay/WxpayService.java
View File

@ -9,6 +9,9 @@ import net.lab1024.smartadmin.module.system.royalcanin.good.service.OrderService
import net.lab1024.smartadmin.module.system.royalcanin.memberAccount.MemberAccountChangeEntity; import net.lab1024.smartadmin.module.system.royalcanin.memberAccount.MemberAccountChangeEntity;
import net.lab1024.smartadmin.module.system.royalcanin.notify.model.NotifyEntity; import net.lab1024.smartadmin.module.system.royalcanin.notify.model.NotifyEntity;
import net.lab1024.smartadmin.module.system.royalcanin.notify.service.NotifyService; import net.lab1024.smartadmin.module.system.royalcanin.notify.service.NotifyService;
import net.lab1024.smartadmin.module.system.royalcanin.orderMaster.AddOrSaveEntity;
import net.lab1024.smartadmin.module.system.royalcanin.orderMaster.OrderCouponEntity;
import net.lab1024.smartadmin.module.system.royalcanin.orderMaster.QueryEntity;
import net.lab1024.smartadmin.module.system.wxpay.sdk.WXPay; import net.lab1024.smartadmin.module.system.wxpay.sdk.WXPay;
import net.lab1024.smartadmin.module.system.wxpay.sdk.WXPayUtil; import net.lab1024.smartadmin.module.system.wxpay.sdk.WXPayUtil;
import net.lab1024.smartadmin.module.system.wxpay.wxPayModel.WxPayEntity; import net.lab1024.smartadmin.module.system.wxpay.wxPayModel.WxPayEntity;
@ -90,7 +93,6 @@ public class WxpayService {
SortedMap<String, String> sortedMap = WXPayUtil.getSortedMap(callBackMap); SortedMap<String, String> sortedMap = WXPayUtil.getSortedMap(callBackMap);
// 校验签名是否正确 // 校验签名是否正确
if (!WXPayUtil.isCorrectSign(sortedMap, config.getKey())) { if (!WXPayUtil.isCorrectSign(sortedMap, config.getKey())) {
System.out.println("签名校验成功！");
// 更新订单状态 // 更新订单状态
if ("SUCCESS".equals(sortedMap.get("result_code"))) { if ("SUCCESS".equals(sortedMap.get("result_code"))) {
String outTradeNo = sortedMap.get("out_trade_no"); // 流水号 String outTradeNo = sortedMap.get("out_trade_no"); // 流水号
@ -118,7 +120,42 @@ public class WxpayService {
memberAccountChangeEntity.setMemberId(orderEntity.getMemberId()); memberAccountChangeEntity.setMemberId(orderEntity.getMemberId());
memberAccountService.memberAccountChange(memberAccountChangeEntity); memberAccountService.memberAccountChange(memberAccountChangeEntity);
//更新订单信息
QueryEntity queryEntity = new QueryEntity();
queryEntity.setOrderNumber(outTradeNo);
String orderEntityJson = orderService.query(queryEntity);
com.alibaba.fastjson.JSONArray jsonArray = JSONObject.parseArray(orderEntityJson);
JSONObject jsonObject = (JSONObject)jsonArray.get(0);
if(orderEntity != null) {
AddOrSaveEntity addOrSaveEntity = new AddOrSaveEntity();
addOrSaveEntity.setOrderNumber(outTradeNo);
addOrSaveEntity.setPhoneNumber(orderEntity.getPhoneNumber());
addOrSaveEntity.setStatus("1");
addOrSaveEntity.setOrderDetailList(jsonObject.getString("orderDetailList"));
addOrSaveEntity.setDeliveryType(jsonObject.getString("deliveryType"));
addOrSaveEntity.setSalesAmount(jsonObject.getString("salesAmount"));
addOrSaveEntity.setOrderDate(jsonObject.getString("orderDate"));
addOrSaveEntity.setAddressCityName(jsonObject.getString("addressCityName"));
addOrSaveEntity.setAddressCountyName(jsonObject.getString("addressCountyName"));
addOrSaveEntity.setAddressDetailInfo(jsonObject.getString("addressDetailInfo"));
addOrSaveEntity.setAddressPhoneNumber(jsonObject.getString("addressPhoneNumber"));
addOrSaveEntity.setAddressProvinceName(jsonObject.getString("addressProvinceName"));
addOrSaveEntity.setAddressUserName(jsonObject.getString("addressUserName"));
addOrSaveEntity.setPaymentAmount(totalFee);
addOrSaveEntity.setPaymentToken(sortedMap.get("transaction_id"));
if (orderEntity.getCouponCode() != "" && null != orderEntity.getCouponCode()) {
//coupon json化
OrderCouponEntity orderCouponEntity = new OrderCouponEntity();
orderCouponEntity.setCouponCode(orderEntity.getCouponCode());
orderCouponEntity.setCouponName(orderEntity.getCouponName());
orderCouponEntity.setCouponId(orderEntity.getCouponId());
Map<String, String> orderCouponParamMap = MapRemoveNullUtil.setConditionMap(orderCouponEntity);
MapRemoveNullUtil.removeNullEntry(orderCouponParamMap);
net.sf.json.JSONObject orderCouponJson = net.sf.json.JSONObject.fromObject(orderCouponParamMap);
addOrSaveEntity.setOrderCoupon(orderCouponJson.toString());
}
orderService.addOrSave(addOrSaveEntity);
}
NotifyEntity notifyEntity = new NotifyEntity(); NotifyEntity notifyEntity = new NotifyEntity();
notifyEntity.setAppId(sortedMap.get("appid")); notifyEntity.setAppId(sortedMap.get("appid"));
notifyEntity.setMchId(sortedMap.get("mch_id")); notifyEntity.setMchId(sortedMap.get("mch_id"));