diff --git a/mallinkAdmin/src/main/java/com/iformall/controller/WxCarController.java b/mallinkAdmin/src/main/java/com/iformall/controller/WxCarController.java index 1b57220e5..7046e2628 100644 --- a/mallinkAdmin/src/main/java/com/iformall/controller/WxCarController.java +++ b/mallinkAdmin/src/main/java/com/iformall/controller/WxCarController.java @@ -205,7 +205,11 @@ public class WxCarController extends BaseController { } // check End coupon.setTenantId(user.getTenantId()); - wxCouponService.saveOrUpdate(coupon); + + ResultData resultData = wxCouponService.saveOrUpdate(coupon); + if (resultData.code != ResultData.SUCCESS){ + return resultData; + } // Save to wx_coupon_car WxCouponCar couponCar = new WxCouponCar(); diff --git a/mallinkService/src/main/java/com/iformall/common/GlobalDefultExceptionHandler.java b/mallinkService/src/main/java/com/iformall/common/GlobalDefultExceptionHandler.java index 3fdf4b8c2..331c6267d 100644 --- a/mallinkService/src/main/java/com/iformall/common/GlobalDefultExceptionHandler.java +++ b/mallinkService/src/main/java/com/iformall/common/GlobalDefultExceptionHandler.java @@ -30,7 +30,7 @@ public class GlobalDefultExceptionHandler { @ExceptionHandler(Exception.class) @ResponseBody - public String defultExcepitonHandler(HttpServletRequest request, Exception e) { + public ResultData defultExcepitonHandler(HttpServletRequest request, Exception e) { log(e, request); if(isFmException) { @@ -39,7 +39,7 @@ public class GlobalDefultExceptionHandler { if(me.getErrorCode() == ErrorCode.NET_TOKEN_EMPTY.getCode() || me.getErrorCode() == ErrorCode.NET_TOKEN_INVALID.getCode()) { // token异常问题, 不发邮件 - return e.getMessage(); + return new ResultData(me.getErrorCode(),me.getMessage()); } } StringWriter sw = new StringWriter(); @@ -60,9 +60,10 @@ public class GlobalDefultExceptionHandler { } - return e.getMessage(); + return new ResultData(Result.ERROR, e.getMessage()); } + private void log(Exception ex, HttpServletRequest request) { logger.error("************************异常开始*******************************"); logger.error("请求地址:" + request.getRequestURL()); diff --git a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java index 4709304dd..f92ac0c7b 100644 --- a/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java +++ b/mallinkService/src/main/java/com/iformall/service/impl/WxCouponServiceImpl.java @@ -67,6 +67,7 @@ public class WxCouponServiceImpl implements WxCouponService { return wxCouponMapper.findVoDetail(id); } + private Long parseMerchantId(JSONObject merchantParam){ return Long.valueOf(merchantParam.getString("id")); } @@ -78,7 +79,6 @@ public class WxCouponServiceImpl implements WxCouponService { } - @Override @Transactional(isolation=Isolation.SERIALIZABLE, propagation = Propagation.REQUIRED, rollbackFor = {Exception.class}) public ResultData saveOrUpdate(WxCoupon record) { @@ -107,7 +107,7 @@ public class WxCouponServiceImpl implements WxCouponService { if (record.getId() == null) { record.setId(idWorker.nextId()); - if (!record.getMerchantParams().isEmpty()) + if (record.getMerchantParams() != null) { List merchantParamList = JSONObject.parseArray(record.getMerchantParams(), JSONObject.class); List businessList= new ArrayList<>(); diff --git a/mallinkService/src/main/resources/mapper/WxCouponCarMapper.xml b/mallinkService/src/main/resources/mapper/WxCouponCarMapper.xml index 74fcbe6e5..a06bdb561 100644 --- a/mallinkService/src/main/resources/mapper/WxCouponCarMapper.xml +++ b/mallinkService/src/main/resources/mapper/WxCouponCarMapper.xml @@ -92,7 +92,6 @@ - @@ -114,10 +113,10 @@ - c.id,c.tenant_id,c.type,c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.use_limit_quantity,c.target_ad,c.send_type,c.valid_type,c.valid_start_date,c.valid_end_date,c.valid_days,c.detail,c.price,c.unit,c.remain_inventory,c.inventory,c.remark,c.status,c.create_date,c.update_date,c.business, + c.id,c.tenant_id,c.type,c.cover_img,c.title,c.sub_title,c.sale_price,c.use_price,c.use_limit_quantity,c.send_type,c.valid_type,c.valid_start_date,c.valid_end_date,c.valid_days,c.detail,c.price,c.unit,c.remain_inventory,c.inventory,c.remark,c.status,c.create_date,c.update_date,c.business, car.vendor_type, car.vendor_params - select from wx_coupon c,wx_coupon_car car