From 0a7d00f727903a94bf3b46ffd024be2fb720e324 Mon Sep 17 00:00:00 2001 From: xhxu Date: Tue, 20 Sep 2022 15:00:35 +0800 Subject: [PATCH] //third --- .../main/java/com/iformall/utils/AppTest.java | 64 ++++++++++++++----- .../impl/WxThirdPartyOrdersServiceImpl.java | 6 +- 2 files changed, 50 insertions(+), 20 deletions(-) diff --git a/mallinkPublicApi/src/main/java/com/iformall/utils/AppTest.java b/mallinkPublicApi/src/main/java/com/iformall/utils/AppTest.java index 7a24b3bb4..1b3eb126a 100644 --- a/mallinkPublicApi/src/main/java/com/iformall/utils/AppTest.java +++ b/mallinkPublicApi/src/main/java/com/iformall/utils/AppTest.java @@ -47,18 +47,18 @@ public class AppTest { /** * 创建交易信息 参数 */ - IdWorker idWorker = IdWorker.get(); - - paramMap.put("sourceType", EnumUserType.BUSINESS_CIRCLE.getCode().toString()); +// IdWorker idWorker = IdWorker.get(); - paramMap.put("transactionId",String.valueOf(idWorker.nextId()));//***订单Id - paramMap.put("shopNumber","1001");//***门店唯一标识 对应双方平台门店 -// paramMap.put("shopName","百丽");//门店名称 - paramMap.put("userNumber","516625539215818752");//***会员Id -// paramMap.put("userPhone","18872592633");//会员手机号 - paramMap.put("timeEnd","2021-07-20 15:19:00");//***付款时间(yyyy-MM-dd HH:mm:ss) - paramMap.put("amount","17900");//***付款金额(分) -// paramMap.put("summary","");//付款摘要 +// paramMap.put("sourceType", EnumUserType.BUSINESS_CIRCLE.getCode().toString()); +// +// paramMap.put("transactionId",String.valueOf(idWorker.nextId()));//***订单Id +// paramMap.put("shopNumber","1001");//***门店唯一标识 对应双方平台门店 +//// paramMap.put("shopName","百丽");//门店名称 +// paramMap.put("userNumber","516625539215818752");//***会员Id +//// paramMap.put("userPhone","18872592633");//会员手机号 +// paramMap.put("timeEnd","2021-07-20 15:19:00");//***付款时间(yyyy-MM-dd HH:mm:ss) +// paramMap.put("amount","17900");//***付款金额(分) +//// paramMap.put("summary","");//付款摘要 /** * 交易退款信息 参数 @@ -78,12 +78,32 @@ public class AppTest { // paramMap.put("transactionId",String.valueOf(idWorker.nextId()));//***订单Id // paramMap.put("shopNumber","1001");//***门店唯一标识 对应双方平台门店 // paramMap.put("shopName","百丽");//门店名称 -// paramMap.put("userNumber","551612907794915328");//***会员Id546907706202185728 -//// paramMap.put("userPhone","18872592633");//会员手机号 -// paramMap.put("timeEnd","2021-06-03 19:30:00");//***积分抵扣时间 -// paramMap.put("amount","100");//***付款金额(分) -// paramMap.put("summary","我要换东西");//付款摘要 +//// paramMap.put("userNumber","551612907794915328");//***会员Id546907706202185728 +// paramMap.put("userPhone","17600293031");//会员手机号 +// paramMap.put("timeEnd","2022-09-20 14:30:00");//***积分抵扣时间 +// paramMap.put("amount","100");//***积分 +// paramMap.put("summary","我要换东西1");//付款摘要 + /** + * 积分抵扣 退款 参数 + */ +// IdWorker idWorker = IdWorker.get(); +// paramMap.put("transactionId","732090091885301760");//***订单Id +// paramMap.put("refundTime","2022-09-20 14:35:00");//***时间 +// paramMap.put("amount","100");//***积分 +// paramMap.put("summary","积分抵扣退款");//摘要 + + + /** + * 积分变动 参数 + */ + IdWorker idWorker = IdWorker.get(); + paramMap.put("transactionId",String.valueOf(idWorker.nextId()));//***订单Id +// paramMap.put("userNumber","551612907794915328");//***会员Id546907706202185728 + paramMap.put("userPhone","17600293031");//会员手机号 + paramMap.put("timeEnd","2022-09-20 14:35:00");//***积分抵扣时间 + paramMap.put("amount",100);//***积分 + paramMap.put("summary","加积分");// /** * 参数加密并封装 @@ -121,8 +141,18 @@ public class AppTest { */ // String s = HttpUtil.doPost("https://openapitest.malls.iformall.com/api/thirdCircle/pointDeduction", headMap, JSON.toJSONString(paramMap)); + /** + * 积分抵扣退款 接口 + */ +// String s = HttpUtil.doPost("https://openapitest.malls.iformall.com/api/thirdCircle/pointRefund", headMap, JSON.toJSONString(paramMap)); + + /** + * 积分抵扣退款 接口 + */ + String s = HttpUtil.doPost("https://openapitest.malls.iformall.com/api/thirdCircle/pointChange", headMap, JSON.toJSONString(paramMap)); + -// System.out.println(s); + 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 5becfc5f1..9fb7d4d8a 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java @@ -507,7 +507,7 @@ public class WxThirdPartyOrdersServiceImpl implements WxThirdPartyOrdersService wxThirdPartyOrdersMapper.updateOrderStatus(order); int creditNum = 0; - if(order.getEarnPoints().equals(EnumYesOrNo.YES.getCode())){ +// if(order.getEarnPoints().equals(EnumYesOrNo.YES.getCode())){ WxCreditHistory creditHistory = new WxCreditHistory(); creditHistory.setTenantId(record.getFinalTenantId()); creditHistory.setOperatorType(EnumUserType.THIRD_CIRCLE.getCode()); @@ -519,7 +519,7 @@ public class WxThirdPartyOrdersServiceImpl implements WxThirdPartyOrdersService creditHistory.setCreditType(EnumScoreType.REFUND_REDUCE_CREDIT.getCode()); creditHistory.setCreditNum(record.getRefundAmount()); creditHistory.setSpend(0-record.getRefundAmount()); - creditHistory.setChangePurpose(record.getSourceAppName()+"·积分退款:商户["+record.getMerchantName()+"] ("+record.getRefundAmountStr()+") "); + creditHistory.setChangePurpose(record.getSourceAppName()+"·积分抵扣退款:商户["+record.getMerchantName()+"] (-"+record.getRefundAmount()+") "); creditHistory = wxCreditHistoryService.saveOrUpdate(creditHistory,record.getTenantId()); if (creditHistory.getCreditNum() != null) { @@ -530,7 +530,7 @@ public class WxThirdPartyOrdersServiceImpl implements WxThirdPartyOrdersService record.setPointsUpdateTime(creditHistory.getCreateDate()); this.updatePoints(record); } - } +// } redisLock.unlock(lockKey, timeStr); // return new ResultData(creditNum); }