jiangjiazhi / regional-platform

Authored by liquanyu over 2 years ago

Exists in master and in 3 other branches

Showing 3 changed files with 16 additions and 1 deletions

...	...	@@ -18,6 +18,7 @@
18	18	import com.lyms.platform.permission.model.WeixinQrcodeConfigQuery;
19	19	import com.lyms.platform.permission.service.CouponService;
20	20	import com.lyms.platform.permission.service.OrganizationService;
	21	+import com.lyms.platform.permission.service.UsersService;
21	22	import com.lyms.platform.permission.service.WeixinQrcodeConfigService;
22	23	import com.lyms.platform.pojo.*;
23	24	import com.lyms.platform.query.AntExRecordQuery;
...	...	@@ -48,6 +49,8 @@
48	49
49	50	private Logger logger = LoggerFactory.getLogger(CouponServiceImpl.class);
50	51
	52	+ @Autowired
	53	+ private UsersService usersService;
51	54	/**
52	55	* 1 = 孕妇
53	56	*/
54	57
...	...	@@ -307,12 +310,13 @@
307	310	}
308	311
309	312	private void sendCoupon(List<Map<String, Object>> temps, String hospitalId, Integer createUserId, String userId, Integer personType, String areaCode) {
	313	+ String chid = usersService.getUsers(createUserId).getOrgId().toString();
310	314	for (Map<String, Object> temp : temps) {
311	315	Object sendType = temp.get("send_type");
312	316	if (sendType != null) {/** 1=全部发放 2=按有效时间发放 */
313	317	CouponInfo couponInfo = new CouponInfo();
314	318	couponInfo.setCreateDate(new Date());
315		- couponInfo.setCreateHospitalId(hospitalId);
	319	+ couponInfo.setCreateHospitalId(chid);
316	320	couponInfo.setCreateUserId(String.valueOf(createUserId));
317	321	couponInfo.setSequenceId(genIdService.poll(areaCode));
318	322	couponInfo.setStatus(1);

...	...	@@ -1962,6 +1962,7 @@
1962	1962
1963	1963
1964	1964	public static void main(String[] args) {
	1965	+ System.out.println(DateUtil.addDay(new Date(),-20).getTime());
1965	1966	}
1966	1967
1967	1968	}

...	...	@@ -430,6 +430,16 @@
430	430	//秦皇岛定制字段：是否产筛 0：未产筛 1：已产筛
431	431	public Integer productionSieveType;
432	432
	433	+ private String height;
	434	+
	435	+ public String getHeight() {
	436	+ return height;
	437	+ }
	438	+
	439	+ public void setHeight(String height) {
	440	+ this.height = height;
	441	+ }
	442	+
433	443	public Integer getProductionSieveType() {
434	444	return productionSieveType;
435	445	}