Просмотр исходного кода

[调整]接口异常处理

release_toaliyun_real
Burce 6 лет назад
Родитель
Сommit
7e41254017
4 измененных файлов: 23 добавлений и 7 удалений
  1. +5
    -0
      mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendController.java
  2. +14
    -6
      mallinkBApi/src/main/java/com/iformall/controller/WxCouponSendController.java
  3. +1
    -0
      mallinkService/src/main/java/com/iformall/common/ErrorCode.java
  4. +3
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java

+ 5
- 0
mallinkAdmin/src/main/java/com/iformall/controller/market/WxCouponSendController.java Просмотреть файл

@@ -15,6 +15,7 @@ import com.iformall.enums.EnumCouponSendSendType;
import com.iformall.enums.EnumCouponSendStatus;
import com.iformall.enums.EnumCouponSendType;
import com.iformall.enums.EnumCouponStatus;
import com.iformall.exception.MallinkException;
import com.iformall.service.WxCouponActionLogService;
import com.iformall.service.WxCouponSendService;
import com.iformall.service.WxCouponService;
@@ -145,7 +146,11 @@ public class WxCouponSendController extends BaseController {
if (wxCouponSend == null) {
return new ResultData(ErrorCode.COUPON_SEND_IS_INVALID);
}
try {
wxCouponSendService.updateInvalid(wxCouponSend);
} catch (MallinkException e) {
return new ResultData(e.getErrorCode(),e.getMessage()) ;
}
return new ResultData();
}



+ 14
- 6
mallinkBApi/src/main/java/com/iformall/controller/WxCouponSendController.java Просмотреть файл

@@ -49,7 +49,7 @@ public class WxCouponSendController extends BaseController {
public ResultData list(WxCouponSend wxCouponSend, Integer pageNum, Integer pageSize) {
logger.debug("[" + getIpAddr() + "] WxCouponSendController::list");
if (Objects.isNull(wxCouponSend.getSendType())) {
throw new MallinkException(ErrorCode.SYS_PARAMETER_NOT_NULL);
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL);
}
wxCouponSend.setTenantId(getTenantId());
wxCouponSend.setMerchantId(getUser().getMerchantId());
@@ -78,20 +78,20 @@ public class WxCouponSendController extends BaseController {
public ResultData handSel(@RequestBody Map<String, Object> params) {
logger.debug("[" + getIpAddr() + "] WxCouponSendController::handSel");
if (CollectionUtils.isEmpty(params)) {
throw new MallinkException(ErrorCode.SYS_PARAMETER_NOT_NULL);
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL);
}
WxCUser cu = wxCUserMapper.selectByPrimaryKey(params.get("cUserId"));
if (Objects.isNull(cu)) {
throw new MallinkException(ErrorCode.USER_IS_EMPTY);
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL);
}

if (!params.containsKey("wxCouponSendIds")) {
throw new MallinkException(ErrorCode.COUPON_IS_EMPTY);
return new ResultData(ErrorCode.COUPON_IS_EMPTY);
}

List<String> wxCouponSendIds = (List<String>) params.get("wxCouponSendIds");
if (CollectionUtils.isEmpty(wxCouponSendIds)) {
throw new MallinkException(ErrorCode.COUPON_IS_EMPTY);
return new ResultData(ErrorCode.COUPON_IS_EMPTY);
}

WxCouponSend wxCouponSend = new WxCouponSend();
@@ -99,7 +99,15 @@ public class WxCouponSendController extends BaseController {
wxCouponSend.setTenantId(getTenantId());
wxCouponSend.setSendType(EnumCouponSendSendType.MERCHANT.getCode());
wxCouponSend.setStatus(EnumCouponSendStatus.VALID.getCode());
wxCouponSendService.handSel(wxCouponSend, cu);
try {
wxCouponSendService.handSel(wxCouponSend, cu);
} catch (MallinkException e) {
logger.error("注异常: " + e.getMessage());
return new ResultData(e.getErrorCode(), e.getMessage());
} catch (Exception e) {
logger.error("注异常: " + e.getMessage());
return new ResultData(ErrorCode.COUPON_HANDSEL_VERIFY, e.getMessage());
}
return new ResultData();
}



+ 1
- 0
mallinkService/src/main/java/com/iformall/common/ErrorCode.java Просмотреть файл

@@ -193,6 +193,7 @@ public enum ErrorCode{
COUPON_ORDER_IS_LATER_THAN_VALIDDATE(4007, "卡券使用期已结束"),
COUPON_ORDER_IS_PRE_VERIFY(4008, "卡券已被预核销"),
COUPON_SEND_LIMIT_VERIFY(4009, "商户购券数错误"),
COUPON_HANDSEL_VERIFY(4010, "商户发券异常"),

/**
* 卡


+ 3
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxCouponSendServiceImpl.java Просмотреть файл

@@ -607,9 +607,11 @@ public class WxCouponSendServiceImpl implements WxCouponSendService {
couponSendList.forEach(cs -> {
// 发放免费券
WxCouponOrder couponOrder = wxOrderService.sendFreeCouponToUser(user.getId(), cs.getCouponId(), cs);
wxCouponActionLogService.addOne(user.getTenantId(), cs.getCouponId(), couponOrder.getId(), cs.getSendType(), cs.getId());
if (couponOrder != null) {
wxCouponActionLogService.addOne(user.getTenantId(), cs.getCouponId(), couponOrder.getId(), cs.getSendType(), cs.getId());
sendMsgForSendCoupon(cs.getTenantId(), cs, couponOrder, user);
} else {
logger.warn("handSel couponOrder is null");
}
});
}


Загрузка…
Отмена
Сохранить