From 8c8208499c1f068c54a63b39d162a3ec9d64d3ac Mon Sep 17 00:00:00 2001 From: xhxu Date: Thu, 29 Apr 2021 18:04:12 +0800 Subject: [PATCH] businessCircle tran --- .../main/java/com/iformall/utils/AppTest.java | 49 ++++++++++--------- .../impl/WxThirdPartyOrdersServiceImpl.java | 4 +- 2 files changed, 29 insertions(+), 24 deletions(-) diff --git a/mallinkPublicApi/src/main/java/com/iformall/utils/AppTest.java b/mallinkPublicApi/src/main/java/com/iformall/utils/AppTest.java index 23cbaf9cf..1b2685819 100644 --- a/mallinkPublicApi/src/main/java/com/iformall/utils/AppTest.java +++ b/mallinkPublicApi/src/main/java/com/iformall/utils/AppTest.java @@ -36,22 +36,22 @@ public class AppTest { /** * 创建交易信息 参数 */ -// IdWorker idWorker = IdWorker.get(); -// paramMap.put("transactionId",String.valueOf(idWorker.nextId()));//***订单Id -// paramMap.put("shopNumber","1001");//***门店唯一标识 对应双方平台门店 -// paramMap.put("shopName","百丽");//门店名称 -// paramMap.put("userNumber","542490555719278592");//***会员Id -// paramMap.put("userPhone","18872592633");//会员手机号 -// paramMap.put("timeEnd","2021-04-26 11:43:00");//***付款时间(yyyy-MM-dd HH:mm:ss) -// paramMap.put("amount","1000");//***付款金额(分) -// paramMap.put("summary","我要加积分");//付款摘要 + IdWorker idWorker = IdWorker.get(); + paramMap.put("transactionId",String.valueOf(idWorker.nextId()));//***订单Id + paramMap.put("shopNumber","1001");//***门店唯一标识 对应双方平台门店 + paramMap.put("shopName","百丽");//门店名称 + paramMap.put("userNumber","546907706202185728");//***会员Id + paramMap.put("userPhone","18872592633");//会员手机号 + paramMap.put("timeEnd","2021-04-27 11:43:00");//***付款时间(yyyy-MM-dd HH:mm:ss) + paramMap.put("amount","1000");//***付款金额(分) + paramMap.put("summary","我要加积分");//付款摘要 /** * 交易退款信息 参数 */ // IdWorker idWorker = IdWorker.get(); // paramMap.put("transactionId","547662852896411648");//***订单Id -// paramMap.put("refundTime","2021-04-26 11:50:00");//***退款时间(yyyy-MM-dd HH:mm:ss) +// paramMap.put("refundTime","2021-04-27 11:50:00");//***退款时间(yyyy-MM-dd HH:mm:ss) // paramMap.put("refundAmount","1000");//退款金额(分) // paramMap.put("refundSummary","我要退款");//付款摘要 // paramMap.put("refundId",String.valueOf(idWorker.nextId()));//退款订单号 @@ -59,15 +59,15 @@ public class AppTest { /** * 积分抵扣 参数 */ - IdWorker idWorker = IdWorker.get(); - paramMap.put("transactionId",String.valueOf(idWorker.nextId()));//***订单Id - paramMap.put("shopNumber","1001");//***门店唯一标识 对应双方平台门店 - paramMap.put("shopName","百丽");//门店名称 - paramMap.put("userNumber","542490555719278592");//***会员Id - paramMap.put("userPhone","18872592633");//会员手机号 - paramMap.put("timeEnd","2021-04-26 11:43:00");//***积分抵扣时间 - paramMap.put("amount","100");//***付款金额(分) - paramMap.put("summary","我要换东西");//付款摘要 +// IdWorker idWorker = IdWorker.get(); +// paramMap.put("transactionId",String.valueOf(idWorker.nextId()));//***订单Id +// paramMap.put("shopNumber","1001");//***门店唯一标识 对应双方平台门店 +// paramMap.put("shopName","百丽");//门店名称 +// paramMap.put("userNumber","546907706202185728");//***会员Id546907706202185728 +// paramMap.put("userPhone","18872592633");//会员手机号 +// paramMap.put("timeEnd","2021-04-26 11:43:00");//***积分抵扣时间 +// paramMap.put("amount","100");//***付款金额(分) +// paramMap.put("summary","我要换东西");//付款摘要 /** @@ -86,12 +86,17 @@ public class AppTest { /** * 创建交易信息 接口 */ -// String s = HttpUtil.doPost("https://openapitest.malls.iformall.com/api/thirdCircle/order", headMap, JSON.toJSONString(paramMap)); + String s = HttpUtil.doPost("https://openapitest.malls.iformall.com/api/thirdCircle/order", headMap, JSON.toJSONString(paramMap)); /** - * 创建交易信息 接口 + * 交易退款 接口 + */ +// String s = HttpUtil.doPost("https://openapitest.malls.iformall.com/api/thirdCircle/orderRefund", headMap, JSON.toJSONString(paramMap)); + + /** + * 交易退款 接口 */ - String s = HttpUtil.doPost("https://openapitest.malls.iformall.com/api/thirdCircle/orderRefund", headMap, JSON.toJSONString(paramMap)); +// String s = HttpUtil.doPost("https://openapitest.malls.iformall.com/api/thirdCircle/pointDeduction", headMap, JSON.toJSONString(paramMap)); System.out.println(s); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java index 73fdc115b..7e7bb4914 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java @@ -367,9 +367,9 @@ public class WxThirdPartyOrdersServiceImpl implements WxThirdPartyOrdersService creditHistory.setCUserId(basicInfo.getId()); creditHistory.setOperatorId(basicInfo.getId()); creditHistory.setOperatorType(EnumUserType.THIRD_CIRCLE.getCode()); - creditHistory.setCreditNum(record.getAmount()); + creditHistory.setCreditNum(record.getPayAmount()); creditHistory.setCreditType(EnumScoreType.CHANGE_CREDIT.getCode()); - creditHistory.setChangePurpose(record.getSourceAppName()+"·积分抵扣{}"+record.getSummary()); + creditHistory.setChangePurpose(record.getSourceAppName()+"·积分抵扣-"+record.getPayAmount()+"{"+record.getSummary()+"}"); creditHistory.setCouponId(record.getId()); creditHistory = wxCreditHistoryService.saveOrUpdate(creditHistory, record.getTenantId()); Integer creditNum = 0;