From e37237f905858bbd5cd1d6bf6be58b5c91a429bf Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Thu, 20 Aug 2020 16:58:02 +0800 Subject: [PATCH] fix --- .../service/impl/WxCouponSendServiceImpl.java | 17 ++++++++++++++--- .../service/park/impl/cyf/CYFParkService.java | 5 +++-- 2 files changed, 17 insertions(+), 5 deletions(-) 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 c75131318..f7841e689 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java @@ -417,9 +417,20 @@ public class WxCouponSendServiceImpl implements WxCouponSendService { //找出用户手机号 String phone = user.getPhone(); - //小程序名称 - WxAppinfo appInfo = wxAppinfoService.getCAppInfo(tenantEntity,EnumPayWay.getEnum(couponOrder.getPayVendor())); - String appName = appInfo.getName(); + //小程序名称,无需支付的那些,默认微信 + EnumPayWay payw = EnumPayWay.getEnum(couponOrder.getPayVendor()); + String appName = ""; + if(payw.getType() == null) { + WxAppinfo appinfoQ = new WxAppinfo(); + appinfoQ.setPlat(EnumPayWay.PAY_WAY_WECHAT.getPlat().getCode()); + appinfoQ.updateTenantInfo(tenantEntity); + appinfoQ.setType(EnumAppType.C.getCode()); + List appList = wxAppinfoService.getList(appinfoQ); + appName = appList.get(0).getName(); + }else { + WxAppinfo appInfo = wxAppinfoService.getCAppInfo(tenantEntity,payw); + appName = appInfo.getName(); + } Map msgReplaceMap = new HashMap(); msgReplaceMap.put("title", title); msgReplaceMap.put("app", appName); diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/cyf/CYFParkService.java b/mallinkService/src/main/java/com/iformall/service/park/impl/cyf/CYFParkService.java index d7d47d1e0..b9bfa226e 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/impl/cyf/CYFParkService.java +++ b/mallinkService/src/main/java/com/iformall/service/park/impl/cyf/CYFParkService.java @@ -99,16 +99,17 @@ public class CYFParkService extends BaseParkService implements ParkAdapterServic }else { return new ResultData(ErrorCode.CYF_STOP_FEE_FAIL.getCode(), "停车费获取失败"); } + //TODO 此处得查询出来停车优惠信息,传给车易付 } @Override public ResultData getCoupon(Map paramMap, WxPark park, WxCouponOrderCarCVo userCar,WxCoupon coupon,String carNumber) { - return null; + return new ResultData() ; } @Override public ResultData getParkStatus(WxPark park) { - return null; + return new ResultData(); } }