diff --git a/mallinkPublicApi/src/main/java/com/iformall/controller/UserThirdCircleOrderController.java b/mallinkPublicApi/src/main/java/com/iformall/controller/UserThirdCircleOrderController.java index 40c9c240b..f22b182a2 100644 --- a/mallinkPublicApi/src/main/java/com/iformall/controller/UserThirdCircleOrderController.java +++ b/mallinkPublicApi/src/main/java/com/iformall/controller/UserThirdCircleOrderController.java @@ -151,7 +151,7 @@ public class UserThirdCircleOrderController extends BaseController { thirdPartyOrders.setSourceType(EnumThirdOrderType.RMB_PAY.getCode()); thirdPartyOrders.setTransactionId(transactionId); - thirdPartyOrders.setEndTime(refundTimeDate); + thirdPartyOrders.setTimeEnd(refundTimeDate); thirdPartyOrders.setSummary(refundSummary); thirdPartyOrders.setRefundAmount(Integer.parseInt(refundAmount)); thirdPartyOrders.setRefundId(refundId); diff --git a/mallinkPublicApi/src/main/java/com/iformall/utils/AppTest.java b/mallinkPublicApi/src/main/java/com/iformall/utils/AppTest.java index f4b536a39..71d289d8b 100644 --- a/mallinkPublicApi/src/main/java/com/iformall/utils/AppTest.java +++ b/mallinkPublicApi/src/main/java/com/iformall/utils/AppTest.java @@ -36,15 +36,25 @@ 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","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","我要加积分");//付款摘要 + paramMap.put("transactionId","547662852896411648");//***订单Id + paramMap.put("refundTime","2021-04-26 11:50:00");//***退款时间(yyyy-MM-dd HH:mm:ss) + paramMap.put("refundAmount","1000");//***退款金额(分) + paramMap.put("refundSummary","我要退款");//付款摘要 + paramMap.put("refundId",String.valueOf(idWorker.nextId()));//退款订单号 /** @@ -63,7 +73,12 @@ 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)); 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 fa0661c6c..83822ee1c 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxThirdPartyOrdersServiceImpl.java @@ -229,6 +229,10 @@ public class WxThirdPartyOrdersServiceImpl implements WxThirdPartyOrdersService record.setCreateTime(now); record.setUpdateTime(now); + record.setShopName(order.getShopName()); + record.setShopNumber(order.getShopNumber()); + record.setUserPhone(order.getUserPhone()); + record.setUserNumber(order.getUserNumber()); record.setAmount(order.getAmount()); record.setPayAmount(order.getPayAmount()); record.setCUserId(order.getCUserId());