xhxu 5 лет назад
Родитель
Сommit
5014122590
3 измененных файлов: 9 добавлений и 8 удалений
  1. +1
    -0
      mallinkPublicApi/src/main/java/com/iformall/controller/UserThirdCircleOrderController.java
  2. +6
    -6
      mallinkPublicApi/src/main/java/com/iformall/utils/AppTest.java
  3. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java

+ 1
- 0
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);


+ 6
- 6
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()));//退款订单号


+ 2
- 2
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;


Загрузка…
Отмена
Сохранить