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 3030197..30dc8fd 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 @@ -18,6 +18,7 @@ import com.lyms.platform.permission.model.WeixinQrcodeConfig; import com.lyms.platform.permission.model.WeixinQrcodeConfigQuery; import com.lyms.platform.permission.service.CouponService; import com.lyms.platform.permission.service.OrganizationService; +import com.lyms.platform.permission.service.UsersService; import com.lyms.platform.permission.service.WeixinQrcodeConfigService; import com.lyms.platform.pojo.*; import com.lyms.platform.query.AntExRecordQuery; @@ -48,6 +49,8 @@ public class CouponServiceImpl implements CouponService { private Logger logger = LoggerFactory.getLogger(CouponServiceImpl.class); + @Autowired + private UsersService usersService; /** * 1 = 孕妇 */ @@ -307,12 +310,13 @@ public class CouponServiceImpl implements CouponService { } private void sendCoupon(List> temps, String hospitalId, Integer createUserId, String userId, Integer personType, String areaCode) { + String chid = usersService.getUsers(createUserId).getOrgId().toString(); for (Map temp : temps) { Object sendType = temp.get("send_type"); if (sendType != null) {/** 1=全部发放 2=按有效时间发放 */ CouponInfo couponInfo = new CouponInfo(); couponInfo.setCreateDate(new Date()); - couponInfo.setCreateHospitalId(hospitalId); + couponInfo.setCreateHospitalId(chid); couponInfo.setCreateUserId(String.valueOf(createUserId)); couponInfo.setSequenceId(genIdService.poll(areaCode)); couponInfo.setStatus(1); diff --git a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java index 832bf81..9128369 100644 --- a/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java +++ b/platform-common/src/main/java/com/lyms/platform/common/utils/DateUtil.java @@ -1962,6 +1962,7 @@ public class DateUtil { public static void main(String[] args) { + System.out.println(DateUtil.addDay(new Date(),-20).getTime()); } } diff --git a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java index b1f6ebf..794801a 100644 --- a/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java +++ b/platform-operate-api/src/main/java/com/lyms/platform/operate/web/request/AntExAddRequest.java @@ -430,6 +430,16 @@ public class AntExAddRequest implements IBasicRequestConvert