From f11f134c52a4442222b5890a54444efd2313689b Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Wed, 4 Nov 2020 17:57:45 +0800 Subject: [PATCH 1/3] =?UTF-8?q?fix=20=E7=9F=AD=E4=BF=A1=E5=8F=91=E9=80=81b?= =?UTF-8?q?ug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../market/WxCouponPresentController.java | 9 ++++++ .../iformall/domain/po/msg/WxMsgRecord.java | 6 ++-- .../service/WxCouponPresentService.java | 3 ++ .../impl/WxCouponPresentServiceImpl.java | 30 +++++++++++++++++++ 4 files changed, 45 insertions(+), 3 deletions(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponPresentController.java b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponPresentController.java index 0ba38e4a3..5149453f2 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponPresentController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponPresentController.java @@ -132,5 +132,14 @@ public class WxCouponPresentController extends BaseController { wxCouponPresentService.add(wxCouponPresent, list, phoneSet,EnumPayWay.PAY_WAY_WECHAT); return new ResultData(); } + + @ApiOperation("新增接口") + @PostMapping("ttttttt") + @SystemControllerLog(description = "新增") + public ResultData tttttt(@RequestBody WxCouponPresent wxCouponPresent) { + //只需要给一端发就可以了。默认给微信小程序发 + wxCouponPresentService.tttttttttttttt(); + return new ResultData(); + } } diff --git a/mallinkService/src/main/java/com/iformall/domain/po/msg/WxMsgRecord.java b/mallinkService/src/main/java/com/iformall/domain/po/msg/WxMsgRecord.java index 5833e9329..64c9bac9e 100644 --- a/mallinkService/src/main/java/com/iformall/domain/po/msg/WxMsgRecord.java +++ b/mallinkService/src/main/java/com/iformall/domain/po/msg/WxMsgRecord.java @@ -58,8 +58,8 @@ public class WxMsgRecord extends BaseMsg { } public TenantEntity getTenantInfo() { - return new TenantEntity() {{ - setTenantId(tenantId); - }}; + TenantEntity tenantEntity = new TenantEntity(); + tenantEntity.setTenantId(tenantId); + return tenantEntity; } } diff --git a/mallinkService/src/main/java/com/iformall/service/WxCouponPresentService.java b/mallinkService/src/main/java/com/iformall/service/WxCouponPresentService.java index fef5b002f..10726ddcf 100644 --- a/mallinkService/src/main/java/com/iformall/service/WxCouponPresentService.java +++ b/mallinkService/src/main/java/com/iformall/service/WxCouponPresentService.java @@ -20,5 +20,8 @@ public interface WxCouponPresentService { WxCouponPresent findById(Long id); ResultData add(WxCouponPresent wxCouponPresent, List list, Set phoneSet,EnumPayWay payWay); + + + void tttttttttttttt(); } diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponPresentServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponPresentServiceImpl.java index a3a25048e..6efaf7425 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponPresentServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponPresentServiceImpl.java @@ -15,6 +15,8 @@ import com.iformall.mapper.WxCouponPresentMapper; import com.iformall.mq.MqBaseProducer; import com.iformall.service.WxAppinfoService; import com.iformall.service.WxCouponPresentService; +import com.iformall.service.msg.impl.SendSmsServiceImpl; + import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; @@ -103,4 +105,32 @@ public class WxCouponPresentServiceImpl implements WxCouponPresentService { logger.info("系统发卡发送短信结束"); logger.info("》》》》》》》》》》》"); } + + + @Autowired + private SendSmsServiceImpl sendSmsService; + @Override + public void tttttttttttttt() { + WxCouponPassword couponPassword = wxCouponPasswordMapper.selectById(483888264577998850L); + TenantEntity tenantEntity = new TenantEntity(); + tenantEntity.setTenantId("789"); + + Map msgReplaceMap = new HashMap(); + msgReplaceMap.put("id", couponPassword.getId().toString()); + msgReplaceMap.put("app", "富茂链客"); + msgReplaceMap.put("title", "饼干消费卡"); + msgReplaceMap.put("pw", couponPassword.getPassword()); + WxMsgRecord wxMsgRecord = new WxMsgRecord(); + wxMsgRecord.setMsgType(EnumMsgRecordType.SMS.getCode()); + wxMsgRecord.setModelType(EnumMsgModel.COUPON_CARD_SEND.getCode()); + wxMsgRecord.setReceiver("18600671341"); + wxMsgRecord.updateTenantInfo(tenantEntity); + wxMsgRecord.setDynamicContentMap(msgReplaceMap); + try { + sendSmsService.send(wxMsgRecord); + } catch (Exception e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } } From c5751f372effbcb2a6928dc4cfc90dc26935dd12 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Thu, 5 Nov 2020 11:45:17 +0800 Subject: [PATCH 2/3] fix bug --- .../src/main/resources/application-prod.yml | 4 +-- .../src/main/resources/application-prod.yml | 4 +-- .../src/main/resources/application-prod.yml | 4 +-- .../car/WxParkCallBackBaseController.java | 2 +- .../WxCarJieShunCallBackController.java | 8 +++--- .../src/main/resources/application-prod.yml | 4 +-- .../src/main/resources/application-prod.yml | 4 +-- .../src/main/resources/application-prod.yml | 4 +-- .../src/main/resources/application-prod.yml | 4 +-- .../java/com/iformall/enums/EnumCarCmd.java | 6 ++++- .../jieshun/JieShunParkCallbackService.java | 25 ++++++++++++++++++- .../src/main/resources/application-prod.yml | 4 +-- .../src/main/resources/application-prod.yml | 4 +-- 13 files changed, 52 insertions(+), 25 deletions(-) diff --git a/mallinkAdmin/src/main/resources/application-prod.yml b/mallinkAdmin/src/main/resources/application-prod.yml index d923c1d09..20157d021 100644 --- a/mallinkAdmin/src/main/resources/application-prod.yml +++ b/mallinkAdmin/src/main/resources/application-prod.yml @@ -58,8 +58,8 @@ spring: # EMAIL mail: host: smtp.exmail.qq.com - username: service@iformall.com - password: jGvApygXN7wc5SzN # 授权密码 + username: sysadministor@iformall.com # 登陆密码sysAdmin1231 + password: SWqPekCEmhUYuYCd # 授权密码 properties: mail: smtp: diff --git a/mallinkBApi/src/main/resources/application-prod.yml b/mallinkBApi/src/main/resources/application-prod.yml index 209002d3b..a875686d6 100644 --- a/mallinkBApi/src/main/resources/application-prod.yml +++ b/mallinkBApi/src/main/resources/application-prod.yml @@ -57,8 +57,8 @@ spring: # EMAIL mail: host: smtp.exmail.qq.com - username: service@iformall.com - password: jGvApygXN7wc5SzN # 授权密码 + username: sysadministor@iformall.com # 登陆密码sysAdmin1231 + password: SWqPekCEmhUYuYCd # 授权密码 properties: mail: smtp: diff --git a/mallinkCApi/src/main/resources/application-prod.yml b/mallinkCApi/src/main/resources/application-prod.yml index 61490f179..cb6c367fc 100644 --- a/mallinkCApi/src/main/resources/application-prod.yml +++ b/mallinkCApi/src/main/resources/application-prod.yml @@ -57,8 +57,8 @@ spring: # EMAIL mail: host: smtp.exmail.qq.com - username: service@iformall.com - password: jGvApygXN7wc5SzN # 授权密码 + username: sysadministor@iformall.com # 登陆密码sysAdmin1231 + password: SWqPekCEmhUYuYCd # 授权密码 properties: mail: smtp: diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/car/WxParkCallBackBaseController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/car/WxParkCallBackBaseController.java index 94d65111a..6a74d18dc 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/car/WxParkCallBackBaseController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/car/WxParkCallBackBaseController.java @@ -189,7 +189,7 @@ public class WxParkCallBackBaseController extends BaseController { userCarQ.setTenantId(wxCarCmdLog.getTenantId()); } userCarQ.setCarNumber(carNumber); - userCarQ.setVendorType(EnumCarVendor.CAR_ETCP.getCode()); + userCarQ.setVendorType(vendor.getCode()); // TODO 可能多用户关联同一张车牌 List userCarList = wxCUserCarService.getList(userCarQ); boolean bFirst = true; diff --git a/mallinkCallback/src/main/java/com/iformall/controller/callback/car/jieshun/WxCarJieShunCallBackController.java b/mallinkCallback/src/main/java/com/iformall/controller/callback/car/jieshun/WxCarJieShunCallBackController.java index 8f6bb375c..163371ed9 100644 --- a/mallinkCallback/src/main/java/com/iformall/controller/callback/car/jieshun/WxCarJieShunCallBackController.java +++ b/mallinkCallback/src/main/java/com/iformall/controller/callback/car/jieshun/WxCarJieShunCallBackController.java @@ -69,11 +69,11 @@ public class WxCarJieShunCallBackController extends WxParkCallBackBaseController * @Author furunxin * @Date 2020/7/8 上午8:27 **/ - @PostMapping(value = "/cyfParkInCallback") + @PostMapping(value = "/park/parkIn") public Result cyfParkInCallback(@RequestBody Map paramMap) { - log.info("["+getIpAddr()+"] cyfParkInCallback: " + paramMap.toString()); + log.info("["+getIpAddr()+"] jieshunCarCallback: " + paramMap.toString()); //解析车易付参数 - return super.parkInCallBack(EnumCarVendor.CAE_CYF, EnumCarCmd.CAR_CYF_CALLBACK_PARK_IN, paramMap); + return super.parkInCallBack(EnumCarVendor.CAR_JIESHUN, EnumCarCmd.CAR_JIESHUN_CALLBACK_PARK_IN, paramMap); } @@ -88,7 +88,7 @@ public class WxCarJieShunCallBackController extends WxParkCallBackBaseController public Result cyfParkOutCallback(@RequestBody WxCarCYFVo param) { String requestJson = JSONObject.toJSONString(param); log.info("["+getIpAddr()+"cyfParkOutCallback: " + requestJson); - return super.parkOutCallBack(EnumCarVendor.CAE_CYF, EnumCarCmd.CAR_CYF_CALLBACK_PARK_OUT, param); + return super.parkOutCallBack(EnumCarVendor.CAE_CYF, EnumCarCmd.CAR_JIESHUN_CALLBACK_PARK_OUT, param); } diff --git a/mallinkCallback/src/main/resources/application-prod.yml b/mallinkCallback/src/main/resources/application-prod.yml index 939f31bb2..abb57e289 100644 --- a/mallinkCallback/src/main/resources/application-prod.yml +++ b/mallinkCallback/src/main/resources/application-prod.yml @@ -58,8 +58,8 @@ spring: # EMAIL mail: host: smtp.exmail.qq.com - username: service@iformall.com - password: jGvApygXN7wc5SzN # 授权密码 + username: sysadministor@iformall.com # 登陆密码sysAdmin1231 + password: SWqPekCEmhUYuYCd # 授权密码 properties: mail: smtp: diff --git a/mallinkMQConsumer/src/main/resources/application-prod.yml b/mallinkMQConsumer/src/main/resources/application-prod.yml index cf810e8ca..864a64001 100644 --- a/mallinkMQConsumer/src/main/resources/application-prod.yml +++ b/mallinkMQConsumer/src/main/resources/application-prod.yml @@ -57,8 +57,8 @@ spring: # EMAIL mail: host: smtp.exmail.qq.com - username: service@iformall.com - password: jGvApygXN7wc5SzN # 授权密码 + username: sysadministor@iformall.com # 登陆密码sysAdmin1231 + password: SWqPekCEmhUYuYCd # 授权密码 properties: mail: smtp: diff --git a/mallinkPosApi/src/main/resources/application-prod.yml b/mallinkPosApi/src/main/resources/application-prod.yml index a918e6276..14a620ae0 100644 --- a/mallinkPosApi/src/main/resources/application-prod.yml +++ b/mallinkPosApi/src/main/resources/application-prod.yml @@ -56,8 +56,8 @@ spring: # EMAIL mail: host: smtp.exmail.qq.com - username: service@iformall.com - password: jGvApygXN7wc5SzN # 授权密码 + username: sysadministor@iformall.com # 登陆密码sysAdmin1231 + password: SWqPekCEmhUYuYCd # 授权密码 properties: mail: smtp: diff --git a/mallinkSchedule/src/main/resources/application-prod.yml b/mallinkSchedule/src/main/resources/application-prod.yml index 996e1db91..c2663d1dc 100644 --- a/mallinkSchedule/src/main/resources/application-prod.yml +++ b/mallinkSchedule/src/main/resources/application-prod.yml @@ -57,8 +57,8 @@ spring: # EMAIL mail: host: smtp.exmail.qq.com - username: service@iformall.com - password: jGvApygXN7wc5SzN # 授权密码 + username: sysadministor@iformall.com # 登陆密码sysAdmin1231 + password: SWqPekCEmhUYuYCd # 授权密码 properties: mail: smtp: diff --git a/mallinkService/src/main/java/com/iformall/enums/EnumCarCmd.java b/mallinkService/src/main/java/com/iformall/enums/EnumCarCmd.java index b2099853a..28603eadf 100644 --- a/mallinkService/src/main/java/com/iformall/enums/EnumCarCmd.java +++ b/mallinkService/src/main/java/com/iformall/enums/EnumCarCmd.java @@ -19,7 +19,11 @@ public enum EnumCarCmd { CAR_CYF_CALLBACK_PARK_IN(620,"车易付进场通知"), CAR_CYF_CALLBACK_PARK_OUT(621,"车易付进场通知"), CAR_CYF_CALLBACK_UNBIND(622,"车易付解绑车牌通知"), - CAR_CYF_CALLBACK_PAID(623,"车易付支付通知") + CAR_CYF_CALLBACK_PAID(623,"车易付支付通知"), + CAR_JIESHUN_CALLBACK_PARK_IN(624,"捷顺进场通知"), + CAR_JIESHUN_CALLBACK_PARK_OUT(625,"捷顺进场通知"), + CAR_JIESHUN_CALLBACK_UNBIND(626,"捷顺解绑车牌通知"), + CAR_JIESHUN_CALLBACK_PAID(627,"捷顺支付通知") ; public static EnumCarCmd getEnum(Integer code) { diff --git a/mallinkService/src/main/java/com/iformall/service/park/impl/jieshun/JieShunParkCallbackService.java b/mallinkService/src/main/java/com/iformall/service/park/impl/jieshun/JieShunParkCallbackService.java index 52401062b..37b9152fc 100644 --- a/mallinkService/src/main/java/com/iformall/service/park/impl/jieshun/JieShunParkCallbackService.java +++ b/mallinkService/src/main/java/com/iformall/service/park/impl/jieshun/JieShunParkCallbackService.java @@ -19,10 +19,33 @@ import lombok.extern.slf4j.Slf4j; @Service public class JieShunParkCallbackService extends BaseParkService implements ParkCallBackAdapterService { + /** + * { + “pno”:”平台编号”, + “tn”:”令牌”, + “ts”:”请求时间” + “sn”:”签名”, + “ve”:”版本号”, + “dataItems”:“[{ + \ “itemId\”: \”435FA12F3C4747B0BA48E945868FC420\”, + \ “parkName” : \”测试\”, + \ “parkCode\” : \” test\”, + \ “inTime\” : \”2017-08-28 15:40:41\”, + \ “inOperator\”: \”张山\” + \ “carNumber” : \”粤-A12345\”, + \ “idno” : \”1234455\”, + \ “equipCode\”: \”2312313\”, + \ “equipName” : \”入口\”, + … + }, + …… + ]” + } + */ @Override public ParkNotifyParam parseInNoticyParam(Object param) { Map paramMap = (Map) param; - String carNumber = paramMap.get(CYFUtil.CYF_CAR_NUMBER).toString(); + String carNumber = paramMap.get(JieShunUtil.CYF_CAR_NUMBER).toString(); String cyfParkId = paramMap.get(CYFUtil.CYF_PARK_ID).toString(); String parkName = paramMap.get(CYFUtil.CYF_PARK_NAME).toString(); String synId = paramMap.get(CYFUtil.CYF_SYN_ID).toString(); diff --git a/mallinkSysAdmin/src/main/resources/application-prod.yml b/mallinkSysAdmin/src/main/resources/application-prod.yml index a8b4ae8b0..9edbe54a1 100644 --- a/mallinkSysAdmin/src/main/resources/application-prod.yml +++ b/mallinkSysAdmin/src/main/resources/application-prod.yml @@ -57,8 +57,8 @@ spring: # EMAIL mail: host: smtp.exmail.qq.com - username: service@iformall.com - password: jGvApygXN7wc5SzN # 授权密码 + username: sysadministor@iformall.com # 登陆密码sysAdmin1231 + password: SWqPekCEmhUYuYCd # 授权密码 properties: mail: smtp: diff --git a/mallinkWebSocketServer/src/main/resources/application-prod.yml b/mallinkWebSocketServer/src/main/resources/application-prod.yml index 4917f77bf..90d7a6f40 100644 --- a/mallinkWebSocketServer/src/main/resources/application-prod.yml +++ b/mallinkWebSocketServer/src/main/resources/application-prod.yml @@ -57,8 +57,8 @@ spring: # EMAIL mail: host: smtp.exmail.qq.com - username: service@iformall.com - password: jGvApygXN7wc5SzN # 授权密码 + username: sysadministor@iformall.com # 登陆密码sysAdmin1231 + password: SWqPekCEmhUYuYCd # 授权密码 properties: mail: smtp: From 752418d9a3309634f67e7b6464323a6f47d6f819 Mon Sep 17 00:00:00 2001 From: xiaohanzi Date: Thu, 5 Nov 2020 12:19:43 +0800 Subject: [PATCH 3/3] fix bug --- .../main/java/com/iformall/controller/car/WxCarController.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/car/WxCarController.java b/mallinkAdmin/src/main/java/com/iformall/controller/car/WxCarController.java index b0809670d..982f4b181 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/car/WxCarController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/car/WxCarController.java @@ -326,7 +326,7 @@ public class WxCarController extends BaseController { TenantEntity tenantEntity = getTenantInfo(); /// 1, get mall's park WxPark park = getCurrentPark(tenantEntity); - if (park.getVendorType() == EnumCarVendor.CAR_ETCP.getCode()) { + if (null != park && park.getVendorType() == EnumCarVendor.CAR_ETCP.getCode()) { String params = park.getVendorParams(); if(params == null) { return new ResultData(ErrorCode.CAR_VENDOR_NOT_SUPPORT.getCode(), "车场不支持");