From cd3ae8733468fb9a148385170ec447565810c7c7 Mon Sep 17 00:00:00 2001 From: liquanyu Date: Tue, 7 Apr 2020 14:54:42 +0800 Subject: [PATCH] update --- .../platform/permission/service/CouponService.java | 1 - .../permission/service/impl/CouponServiceImpl.java | 59 ---------------------- .../msg/worker/TempleteMsgGenerateWorker.java | 29 ++++++----- .../operate/web/controller/CouponController.java | 15 ------ 4 files changed, 16 insertions(+), 88 deletions(-) diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CouponService.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CouponService.java index 4782570..734f203 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CouponService.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/CouponService.java @@ -18,7 +18,6 @@ public interface CouponService{ BaseObjectResponse distErrorData(); BaseObjectResponse validate(String code, Integer type, String hospitalId); - BaseObjectResponse validate1(String code, Integer type, String hospitalId); BaseObjectResponse findList(String userId, String hospitalId, String url,Integer type); diff --git a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java index 2fa7ba9..e5b25de 100644 --- a/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java +++ b/platform-biz-service/src/main/java/com/lyms/platform/permission/service/impl/CouponServiceImpl.java @@ -469,65 +469,6 @@ public class CouponServiceImpl implements CouponService { return RespBuilder.buildSuccess(patientsInfo); } - - - @Override - public BaseObjectResponse validate1(String code, Integer type, String hospitalId) { - Map param = new HashMap<>(); - param.put("code", code); - param.put("type", type); - List couponInfos = couponMapper.findList(param); - if (CollectionUtils.isEmpty(couponInfos)) - return RespBuilder.buildErro(ResponseCode.COUPON_NOT_FOUND); - if (couponInfos.size() > 1) - return RespBuilder.buildErro(ResponseCode.COUPON_NOT_UNIQUE); - - CouponInfo couponInfo = couponInfos.get(0); - Map patientsInfo = getPatientsInfo(couponInfo.getUserId()); - - if (couponInfo.getStatus() == 3) { - return RespBuilder.buildErro(ResponseCode.COUPON_IS_INVALID, patientsInfo); - } - if (couponInfo.getStatus() == -1) { - return RespBuilder.buildErro(ResponseCode.COUPON_IS_DISABLED, patientsInfo); - } - if (couponInfo.getStatus() == 2) { - patientsInfo.put("status",2); - } - else - { - patientsInfo.put("status",1); - } - - Map data = couponMapper.findValidateParam(param); - if (MapUtils.isEmpty(data)) { - return RespBuilder.buildErro(ResponseCode.COUPON_NOT_AVAILABLE, patientsInfo); - } - - PersonModel person = mongoTemplate.findById(couponInfo.getUserId(), PersonModel.class); - - /** 验证时间 */ - if (!validateDate(couponInfo.getUserId(), Integer.parseInt(data.get("actual_start").toString()), Integer.parseInt(data.get("actual_end").toString()), Integer.parseInt(data.get("unit_type").toString()), - data.get("create_hospital_id").toString(), Integer.parseInt(data.get("type").toString()), 2, person.getType())) - return RespBuilder.buildErro(ResponseCode.COUPON_TIME_OUT, patientsInfo); - - /** 验证区域 */ - if (!validateArea(data.get("area_type").toString(), couponInfo.getCreateHospitalId(), hospitalId)) { - return RespBuilder.buildErro(ResponseCode.COUPON_AREA_NO_USE, patientsInfo); - } - -// //验证优惠劵是否临时使用了 该功能属于秦皇岛区域 -// if (couponInfo.getTempStatus() != null && couponInfo.getTempStatus() == 1) { -// //验证临时使用的医院是不是当前登陆的医院 -// if (StringUtils.isNotEmpty(couponInfo.getTempHospitalId()) && !couponInfo.getTempHospitalId().equals(hospitalId)) { -// return RespBuilder.buildErro(ResponseCode.COUPON_IS_USED); -// } -// } - - - return RespBuilder.buildSuccess(patientsInfo); - } - @Override public BaseObjectResponse validateUse(String code, Integer type, String hospitalId) { Map param = new HashMap<>(); diff --git a/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java b/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java index 8f4597f..a509c65 100644 --- a/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java +++ b/platform-msg-generate/src/main/java/com/lyms/platform/msg/worker/TempleteMsgGenerateWorker.java @@ -627,7 +627,7 @@ public class TempleteMsgGenerateWorker implements Runnable { String itemName = "儿童保健"; String nextCheckTime = DateUtils.getDateStr(orderDate, DateUtils.Y_M_D); - MsgRequest request = HelperUtils.getMessageRequest1(template.getSendTime(),messageContent, model.getMphone(), + MsgRequest request = HelperUtils.getMessageRequest1(template.getSendTime(), messageContent, model.getMphone(), ServiceObjEnums.BABYOBJ.getId(), template.getSmsType(), model.getHospitalId(), template.getId(), model.getId(), itemName, nextCheckTime, "", WxTempleteIdEnums.ER_TONG_TI_XING.getId(), service); @@ -720,7 +720,7 @@ public class TempleteMsgGenerateWorker implements Runnable { //疫苗接种人 String vaccinePerson = model.getName(); - MsgRequest request = HelperUtils.getMessageRequest1(template.getSendTime(),messageContent, model.getMphone(), + MsgRequest request = HelperUtils.getMessageRequest1(template.getSendTime(), messageContent, model.getMphone(), ServiceObjEnums.BABYOBJ.getId(), template.getSmsType(), model.getHospitalId(), template.getId(), model.getId(), vaccineName, vaccinePerson, vaccineTime, WxTempleteIdEnums.ER_TONG_YI_MIAO_TIXING.getId(), service); @@ -770,7 +770,7 @@ public class TempleteMsgGenerateWorker implements Runnable { String itemName = "儿童保健"; String nextCheckTime = HelperUtils.getKeyword(start, end, "月龄"); - MsgRequest request = HelperUtils.getMessageRequest1(template.getSendTime(),messageContent, model.getMphone(), + MsgRequest request = HelperUtils.getMessageRequest1(template.getSendTime(), messageContent, model.getMphone(), ServiceObjEnums.BABYOBJ.getId(), template.getSmsType(), model.getHospitalId(), template.getId(), model.getId(), itemName, nextCheckTime, "", WxTempleteIdEnums.ER_TONG_TI_XING.getId(), service); @@ -820,7 +820,7 @@ public class TempleteMsgGenerateWorker implements Runnable { String itemName = "儿童保健"; String nextCheckTime = HelperUtils.getKeyword(start, end, "天"); - MsgRequest request = HelperUtils.getMessageRequest1(template.getSendTime(),messageContent, model.getMphone(), + MsgRequest request = HelperUtils.getMessageRequest1(template.getSendTime(), messageContent, model.getMphone(), ServiceObjEnums.BABYOBJ.getId(), template.getSmsType(), model.getHospitalId(), template.getId(), model.getId(), itemName, nextCheckTime, serDoc, WxTempleteIdEnums.ER_TONG_TI_XING.getId(), service); @@ -870,7 +870,7 @@ public class TempleteMsgGenerateWorker implements Runnable { String itemName = "儿童保健"; String nextCheckTime = DateUtils.getDateStr(yuYueDate, DateUtils.Y_M_D); - MsgRequest request = HelperUtils.getMessageRequest1(template.getSendTime(),messageContent, model.getMphone(), + MsgRequest request = HelperUtils.getMessageRequest1(template.getSendTime(), messageContent, model.getMphone(), ServiceObjEnums.BABYOBJ.getId(), template.getSmsType(), model.getHospitalId(), template.getId(), model.getId(), itemName, nextCheckTime, serDoc, WxTempleteIdEnums.ER_TONG_TI_XING.getId(), service); @@ -1031,6 +1031,9 @@ public class TempleteMsgGenerateWorker implements Runnable { } else { if (serviceType == ServiceTypeEnums.NO_SERVICE.getId() && serviceStatus == ServiceStatusEnums.NO_SERVICE.getId()) { // 无服务产检程序提醒 + // 服务类型和服务状态都为全部时 + patientsQuery.setLastMensesStart(startDate); + patientsQuery.setLastMensesEnd(endDate); patientsQuery.setServiceTypeIsExist(false); List patients = yunBookbuildingService.queryPregnantWithQuery(patientsQuery); for (Patients patient : patients) { @@ -1373,7 +1376,7 @@ public class TempleteMsgGenerateWorker implements Runnable { } String messagePrefix = baseService.getSmsPrefix(config, p.getBookbuildingDoctor(), ServiceObjEnums.YUNOBJ.getId()); String messageContent = "【" + messagePrefix + "】" + template.getContent(); - MsgRequest request = HelperUtils.getMessageRequest1(template.getSendTime(),messageContent, p.getPhone(), + MsgRequest request = HelperUtils.getMessageRequest1(template.getSendTime(), messageContent, p.getPhone(), ServiceObjEnums.YUNOBJ.getId(), template.getSmsType(), p.getHospitalId(), template.getId(), p.getId(), //checkName, checkTimeStr, serDoct, @@ -1401,7 +1404,7 @@ public class TempleteMsgGenerateWorker implements Runnable { } String messagePrefix = baseService.getSmsPrefix(config, p.getBuildDoctor(), ServiceObjEnums.BABYOBJ.getId()); String messageContent = "【" + messagePrefix + "】" + template.getContent(); - MsgRequest request = HelperUtils.getMessageRequest1(template.getSendTime(),messageContent, p.getMphone(), + MsgRequest request = HelperUtils.getMessageRequest1(template.getSendTime(), messageContent, p.getMphone(), ServiceObjEnums.BABYOBJ.getId(), template.getSmsType(), p.getHospitalId(), template.getId(), p.getId(), //checkName, checkTimeStr, serDoct, @@ -1478,10 +1481,10 @@ public class TempleteMsgGenerateWorker implements Runnable { String checkName = "产前检查"; - String serDoct = baseService.getServiceDoctorId(pat.getId(),false); + String serDoct = baseService.getServiceDoctorId(pat.getId(), false); - MsgRequest request = HelperUtils.getMessageRequest1(template.getSendTime(),messageContent, pat.getPhone(), + MsgRequest request = HelperUtils.getMessageRequest1(template.getSendTime(), messageContent, pat.getPhone(), ServiceObjEnums.YUNOBJ.getId(), template.getSmsType(), pat.getHospitalId(), template.getId(), pat.getId(), checkName, checkTimeStr, serDoct, WxTempleteIdEnums.CHAN_JIAN_TI_XING.getId(), service); @@ -1551,7 +1554,7 @@ public class TempleteMsgGenerateWorker implements Runnable { messageContent = HelperUtils.replaceName(pat.getUsername(), messageContent); - MsgRequest request = HelperUtils.getMessageRequest1(template.getSendTime(),messageContent, pat.getPhone(), + MsgRequest request = HelperUtils.getMessageRequest1(template.getSendTime(), messageContent, pat.getPhone(), ServiceObjEnums.YUNOBJ.getId(), template.getSmsType(), pat.getHospitalId(), template.getId(), pat.getId(), checkName, checkWeekName, serDoct, WxTempleteIdEnums.CHAN_JIAN_TI_XING.getId(), service); @@ -1588,7 +1591,7 @@ public class TempleteMsgGenerateWorker implements Runnable { String checkTimeStr = DateUtils.getDateStr(yuYueDate, DateUtils.Y_M_D); String checkName = "产前检查"; - MsgRequest request = HelperUtils.getMessageRequest1(template.getSendTime(),messageContent, pat.getPhone(), + MsgRequest request = HelperUtils.getMessageRequest1(template.getSendTime(), messageContent, pat.getPhone(), ServiceObjEnums.YUNOBJ.getId(), template.getSmsType(), pat.getHospitalId(), template.getId(), pat.getId(), checkName, checkTimeStr, serDoct, WxTempleteIdEnums.CHAN_JIAN_TI_XING.getId(), service); @@ -1699,7 +1702,7 @@ public class TempleteMsgGenerateWorker implements Runnable { String messageContent = "【" + messagePrefix + "】" + template.getContent(); String title = "产后复查"; messageContent = HelperUtils.replaceEL(pat.getUsername(), actualSendDate, messageContent); - MsgRequest request = HelperUtils.getMessageRequest1(template.getSendTime(),messageContent, pat.getPhone(), + MsgRequest request = HelperUtils.getMessageRequest1(template.getSendTime(), messageContent, pat.getPhone(), ServiceObjEnums.CHANOBJ.getId(), template.getSmsType(), pat.getHospitalId(), template.getId(), pat.getId(), title, DateUtils.getDateStr(actualSendDate, DateUtils.Y_M_D), "", WxTempleteIdEnums.CHAN_HOU_FU_CHA.getId(), service); @@ -1811,7 +1814,7 @@ public class TempleteMsgGenerateWorker implements Runnable { String days = "产后" + HelperUtils.getKeyword(start, end, "天"); String title = "产后复查"; - MsgRequest request = HelperUtils.getMessageRequest1(template.getSendTime(),messageContent, pat.getPhone(), + MsgRequest request = HelperUtils.getMessageRequest1(template.getSendTime(), messageContent, pat.getPhone(), ServiceObjEnums.CHANOBJ.getId(), template.getSmsType(), pat.getHospitalId(), template.getId(), pat.getId(), title, days, "", WxTempleteIdEnums.CHAN_HOU_FU_CHA.getId(), service); diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CouponController.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CouponController.java index 26d78cf..8150ef7 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CouponController.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/controller/CouponController.java @@ -114,21 +114,6 @@ public class CouponController extends BaseController { } - - @RequestMapping(method = RequestMethod.GET, value = "/validate1/{code}/{type}") - @ResponseBody - @TokenRequired - public BaseObjectResponse validate1(@PathVariable String code, @PathVariable Integer type, String userId, HttpServletRequest request) { - if(StringUtils.isNotEmpty(userId)) { - if(!couponService.validateUser(userId, code)) { /** 优惠券不属于本人 */ - return RespBuilder.buildErro(ResponseCode.COUPON_IS_NOT_SELF); - } - } - return couponService.validate1(code, type, autoMatchFacade.getHospitalId(getUserId(request))); - } - - - /** * 获取当前登陆医生所属医院的所有人员 * @param request -- 1.8.3.1