java/IgoTravel.git

			@@ -234,8 +234,8 @@
			String email = user.getEmail();
			if(ToolUtil.isNotEmpty(email)){
			Date expirationTime = userCouponRecord.getExpirationTime();
			String e = com.stylefeng.guns.modular.system.util.DateUtil.conversionFormat(2, sdf.format(expirationTime));
			String s = com.stylefeng.guns.modular.system.util.DateUtil.conversionFormat(2, sdf.format(new Date()));
			String e = sdf.format(expirationTime);
			String s = sdf.format(new Date());

			sendEmail(user, sysCouponActivity.getNumber(), s, e, userCouponRecord.getFullMoney().doubleValue());
			}
			@@ -251,8 +251,8 @@
			String email = tUser.getEmail();
			if(ToolUtil.isNotEmpty(email)){
			Date expirationTime = userCouponRecord.getExpirationTime();
			String e = com.stylefeng.guns.modular.system.util.DateUtil.conversionFormat(2, sdf.format(expirationTime));
			String s = com.stylefeng.guns.modular.system.util.DateUtil.conversionFormat(2, sdf.format(new Date()));
			String e = sdf.format(expirationTime);
			String s = sdf.format(new Date());

			sendEmail(tUser, sysCouponActivity.getNumber(), s, e, userCouponRecord.getFullMoney().doubleValue());
			}
			@@ -273,20 +273,52 @@
			public void sendEmail(TUser userInfo1, Integer num, String startTime, String endTime, Double fullMoney){
			try {
			if(ToolUtil.isNotEmpty(userInfo1.getEmail())){
			Integer language = userInfo1.getLanguage();
			String path1 = templatePath + "user/coupon.html";
			Document document1 = Jsoup.parse(new File(path1), "UTF-8");
			document1.getElementById("chinese").remove();
			document1.getElementById("french").remove();
			document1.getElementsByTag("title").get(0).text("Coupon is in");
			Element english_user = document1.getElementById("english_user");
			english_user.text("Hello " + userInfo1.getNickName() + "，");
			Element english_number = document1.getElementById("english_number");
			english_number.text("You have received " + num + " coupons");
			Element english_date = document1.getElementById("english_date");
			english_date.text("You could use them from " + startTime + " to " + endTime);
			Element english_remark = document1.getElementById("english_remark");
			english_remark.text("NB! Coupon is valid only for the trip fare not less than GHS " + fullMoney + " per ride.");
			EmailUtil.send(userInfo1.getEmail(), "Coupon is in", document1.html());
			if(1 == language){
			document1.getElementById("english").remove();
			document1.getElementById("french").remove();
			document1.getElementsByTag("title").get(0).text("优惠券到账");
			Element chinese_user = document1.getElementById("chinese_user");
			chinese_user.text("您好 " + userInfo1.getNickName() + "，");
			Element chinese_number = document1.getElementById("chinese_number");
			chinese_number.text("您有" + num + "张优惠券到账");
			Element chinese_date = document1.getElementById("chinese_date");
			chinese_date.text("此活动有效期在" + startTime + "至" + endTime + "，详情请查看I-GO平台");
			Element chinese_remark = document1.getElementById("chinese_remark");
			chinese_remark.text("注意：满减活动，每单消费至少GHS " + fullMoney + "，才可享用。");
			EmailUtil.send(userInfo1.getEmail(), "优惠券到账", document1.html());
			}
			if(2 == language){
			document1.getElementById("chinese").remove();
			document1.getElementById("french").remove();
			document1.getElementsByTag("title").get(0).text("Coupon is in");
			Element english_user = document1.getElementById("english_user");
			english_user.text("Hello " + userInfo1.getNickName() + "，");
			Element english_number = document1.getElementById("english_number");
			english_number.text("You have received " + num + " coupons");
			Element english_date = document1.getElementById("english_date");
			english_date.text("You could use them from " + com.stylefeng.guns.modular.system.util.DateUtil.conversionFormat(2, startTime) + " to " + com.stylefeng.guns.modular.system.util.DateUtil.conversionFormat(2, endTime));
			Element english_remark = document1.getElementById("english_remark");
			english_remark.text("NB! Coupon is valid only for the trip fare not less than GHS " + fullMoney + " per ride.");
			EmailUtil.send(userInfo1.getEmail(), "Coupon is in", document1.html());
			}
			if(3 == language){
			document1.getElementById("chinese").remove();
			document1.getElementById("english").remove();
			document1.getElementsByTag("title").get(0).text("Le coupon est arrivé");
			Element french_user = document1.getElementById("french_user");
			french_user.text("Cher(ère) " + userInfo1.getNickName() + "，");
			Element french_number = document1.getElementById("french_number");
			french_number.text("Vous avez reçu " + num + " coupons.");
			Element french_date = document1.getElementById("french_date");
			french_date.text("Vous devriez les utiliser du " + com.stylefeng.guns.modular.system.util.DateUtil.conversionFormat(3, startTime) + " au " + com.stylefeng.guns.modular.system.util.DateUtil.conversionFormat(3, endTime) + ", voir le détail sur la plate-forme I-GO.");
			Element french_remark = document1.getElementById("french_remark");
			french_remark.text("Remarque! Le coupon n'est valable que pour le tarif d'au moins GHS " + fullMoney + " par trajet.");
			EmailUtil.send(userInfo1.getEmail(), "Le coupon est arrivé", document1.html());
			}

			//开始生成pdf收据和html收据
			File file = new File("/home/igotechgh/nginx/html/files/html/");
			if(!file.exists()){
			@@ -307,7 +339,7 @@
			tEmail.setLink(link);
			tEmail.setUserId(userInfo1.getId());
			tEmail.setType(1);
			tEmail.setName("Coupon is in");
			tEmail.setName(language == 1 ? "优惠券到账" : language == 2 ? "Coupon is in" : "Le coupon est arrivé");
			tEmail.setCreateTime(new Date());
			int i = cn.hutool.core.date.DateUtil.dayOfWeek(new Date())-1;
			tEmail.setWeek(EmailUtil.getWeek(2,i));