Browse Source

部分代码优化,修改驳回时目标无邮箱BUG

anderx 7 years ago
parent
commit
58237d7176

+ 2 - 2
src/main/java/com/goafanti/common/controller/WebpageController.java

@@ -225,11 +225,11 @@ public class WebpageController extends BaseController {
 	 */
 	@RequestMapping(value = "/portal/index", method = RequestMethod.GET)
 	public ModelAndView portalIndex(HttpServletRequest request, ModelAndView modelview) {
-		modelview.setViewName("/portal/index");
+		modelview.setViewName("/admin/login");
 		/*List<Banners> banners = bannersService.findPortalBanners(BannersType.SHOU_YE.getKey());
 		if (!banners.isEmpty()) {
 			modelview.addObject("banner", banners.get(0));
-		}*/
+		}
 		//政策
 		modelview.addObject("jtdt", newsService.findIndexNewsList(0, NewsType.JTDT.getCode(), 4));
 		//服务项目

+ 1 - 1
src/main/java/com/goafanti/order/controller/AdminNewOrderApiController.java

@@ -248,7 +248,7 @@ public class AdminNewOrderApiController extends CertifyApiController {
 	 * 订单审核
 	 */
 	@RequestMapping(value="/auditOrderNew", method = RequestMethod.POST)
-	public Result auditOrderNewList(String orderNo,Integer orderStatus,String reason){
+	public Result auditOrderNew(String orderNo,Integer orderStatus,String reason){
 		Result res=new Result();
 		if(StringUtils.isBlank(orderNo)){
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "订单编号","订单编号"));

+ 1 - 1
src/main/java/com/goafanti/order/controller/AdminOrderApiController.java

@@ -393,7 +393,7 @@ public class AdminOrderApiController extends CertifyApiController {
 
 	/** 图片上传 **/
 	@RequestMapping(value = "/uploadOrderImg", method = RequestMethod.POST)
-	public Result uploadCustomerImg(HttpServletRequest req,String sign){
+	public Result uploadOrderImg(HttpServletRequest req,String sign){
 		Result res = new Result();
 		res.setData(handleFile(res, "/order_file/", false, req, sign));
 		return res;

+ 4 - 2
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -639,8 +639,10 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			}
 			//发送驳回邮件
 			EmailBo bo = new EmailBo(tite, b.getEmail(), b.getSalesmanName(), a.getDepartmentName(), a.getName(), content);
-			LoggerUtils.debug(logger, "tite:"+tite+"  Email:"+ b.getEmail()+"  收件人姓名:"+ b.getSalesmanName()+ "    部门:"+a.getDepartmentName()+ "  发件人姓名:"+a.getName()+"   内容:"+ content);
-			SendEmailUtil.getInstance().send(bo);
+			if(StringUtils.isNotBlank(b.getEmail())) {
+				LoggerUtils.debug(logger, "tite:"+tite+"  Email:"+ b.getEmail()+"  收件人姓名:"+ b.getSalesmanName()+ "    部门:"+a.getDepartmentName()+ "  发件人姓名:"+a.getName()+"   内容:"+ content);
+				SendEmailUtil.getInstance().send(bo);
+			}
 			LoggerUtils.debug(logger, "=========================================发送邮件成功");
 	}
 

+ 1 - 1
src/main/webapp/WEB-INF/views/common.html

@@ -110,7 +110,7 @@
 				class="glyphicon glyphicon-chevron-right"></span></a>
 		</div>
 		<div class="banner-item" th:if="${banners!=null && banners.size()==1}">
-			<img th:src="${staticDomain +'/upload'+  banners[0].imgurl}"
+			<img th:src="${staticDomain +'/upload'+ banners[0].imgurl}"
 				th:alt="${banners[0].text}">
 		</div>
 	</th:block>