From 5014122590d11bd6f67d9290f6a53295c4a710e1 Mon Sep 17 00:00:00 2001 From: xhxu Date: Mon, 14 Jun 2021 01:30:36 +0800 Subject: [PATCH] circle --- .../controller/UserThirdCircleOrderController.java | 1 + .../src/main/java/com/iformall/utils/AppTest.java | 12 ++++++------ .../service/impl/WxCouponSendServiceImpl.java | 4 ++-- 3 files changed, 9 insertions(+), 8 deletions(-) diff --git a/mallinkPublicApi/src/main/java/com/iformall/controller/UserThirdCircleOrderController.java b/mallinkPublicApi/src/main/java/com/iformall/controller/UserThirdCircleOrderController.java index 7a56f2b1b..4b161e479 100644 --- a/mallinkPublicApi/src/main/java/com/iformall/controller/UserThirdCircleOrderController.java +++ b/mallinkPublicApi/src/main/java/com/iformall/controller/UserThirdCircleOrderController.java @@ -292,6 +292,7 @@ public class UserThirdCircleOrderController extends BaseController { AliBusinessCircleOrder aliBusinessCircleOrder = new AliBusinessCircleOrder(); // aliBusinessCircleOrder.setNoticeId(notifyId); // aliBusinessCircleOrder.setNoticeEventType(msgMethod); + aliBusinessCircleOrder.setSummary(refundSummary); aliBusinessCircleOrder.updateTenantInfo(getTenantInfo()); aliBusinessCircleOrder.setTransactionId(transactionId); diff --git a/mallinkPublicApi/src/main/java/com/iformall/utils/AppTest.java b/mallinkPublicApi/src/main/java/com/iformall/utils/AppTest.java index beb667812..2f8898251 100644 --- a/mallinkPublicApi/src/main/java/com/iformall/utils/AppTest.java +++ b/mallinkPublicApi/src/main/java/com/iformall/utils/AppTest.java @@ -49,14 +49,14 @@ public class AppTest { */ IdWorker idWorker = IdWorker.get(); - paramMap.put("sourceType", EnumUserType.THIRD_CIRCLE.getCode()); + 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","562957699461472256");//***会员Id + paramMap.put("userNumber","441388943427399680");//***会员Id // paramMap.put("userPhone","18872592633");//会员手机号 - paramMap.put("timeEnd","2021-06-11 14:44:00");//***付款时间(yyyy-MM-dd HH:mm:ss) + paramMap.put("timeEnd","2021-06-14 01:10:11");//***付款时间(yyyy-MM-dd HH:mm:ss) paramMap.put("amount","9000");//***付款金额(分) // paramMap.put("summary","");//付款摘要 @@ -64,9 +64,9 @@ public class AppTest { * 交易退款信息 参数 */ // IdWorker idWorker = IdWorker.get(); -// paramMap.put("sourceType", EnumUserType.THIRD_CIRCLE.getCode()); -// paramMap.put("transactionId","562134761668694016");//***订单Id -// paramMap.put("refundTime","2021-06-08 19:46:00");//***退款时间(yyyy-MM-dd HH:mm:ss) +// paramMap.put("sourceType", EnumUserType.BUSINESS_CIRCLE.getCode().toString()); +// paramMap.put("transactionId","564097161459499008");//***订单Id +// paramMap.put("refundTime","2021-06-14 00:58:00");//***退款时间(yyyy-MM-dd HH:mm:ss) //// paramMap.put("refundAmount","1000");//退款金额(分) // paramMap.put("refundSummary","我要退款");//付款摘要 // paramMap.put("refundId",String.valueOf(idWorker.nextId()));//退款订单号 diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java index 96a9690fd..735bb5433 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java @@ -266,7 +266,7 @@ public class WxCouponSendServiceImpl implements WxCouponSendService { } catch (Exception e) { logger.error("收银发券条件判断错误:ID=" + wxCouponSend.getId() + e.getMessage()); } - }else if(param.getClass().equals(BusinessCircleBase.class)){ + }else if(param.getClass().isAssignableFrom(BusinessCircleBase.class)){ BusinessCircleBase circleBase = (BusinessCircleBase) param; try { @@ -325,7 +325,7 @@ public class WxCouponSendServiceImpl implements WxCouponSendService { cUserId = order.getCUserId(); tenantEntity = order; break; - }else if(param.getClass().equals(BusinessCircleBase.class)){ + }else if(param.getClass().isAssignableFrom(BusinessCircleBase.class)){ BusinessCircleBase circleBase = (BusinessCircleBase) param; cUserId = circleBase.getCUserId(); tenantEntity = circleBase;