|
|
|
@@ -65,12 +65,16 @@ public class WxCouponOrderController extends BaseController { |
|
|
|
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true), |
|
|
|
}) |
|
|
|
public ResultData list(@ModelAttribute WxCouponOrder wxCouponOrder, Integer pageNum, Integer pageSize) { |
|
|
|
|
|
|
|
WxCUser user = getUser(); |
|
|
|
if (user.getUserId() == null) { |
|
|
|
logger.error("手机号为空,请授权手机号"); |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "手机号为空,请授权手机号"); |
|
|
|
} |
|
|
|
if (pageNum == null || pageSize == null) { |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); |
|
|
|
} |
|
|
|
if (wxCouponOrder == null) wxCouponOrder = new WxCouponOrderCVo(); |
|
|
|
wxCouponOrder.setCUserId(getUserId()); |
|
|
|
wxCouponOrder.setCUserId(user.getUserId()); |
|
|
|
if (wxCouponOrder.getCouponOrderStatus() == null) |
|
|
|
wxCouponOrder.setSortColumns(BaseEntity.SortField.CreateDate_DESC, BaseEntity.SortField.Id_DESC); |
|
|
|
else if (wxCouponOrder.getCouponOrderStatus() == EnumCouponOrderStatus.COUPON_ORDER_USE_WAIT.getCode()) |
|
|
|
@@ -103,6 +107,11 @@ public class WxCouponOrderController extends BaseController { |
|
|
|
@ApiImplicitParam(name = "couponOrderId", value = "券ID", dataType = "string", paramType = "query", required = true) |
|
|
|
}) |
|
|
|
public ResultData detail(String couponOrderId) { |
|
|
|
WxCUser user = getUser(); |
|
|
|
if (user.getUserId() == null) { |
|
|
|
logger.error("手机号为空,请授权手机号"); |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "手机号为空,请授权手机号"); |
|
|
|
} |
|
|
|
|
|
|
|
if (couponOrderId == null || couponOrderId.equalsIgnoreCase(Constant.UNDEFINED)) { |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); |
|
|
|
@@ -112,7 +121,7 @@ public class WxCouponOrderController extends BaseController { |
|
|
|
if (wxCouponOrderCVo == null) { |
|
|
|
return new ResultData(ErrorCode.COUPON_ORDER_IS_NULL); |
|
|
|
} |
|
|
|
if (!wxCouponOrderCVo.getCUserId().equals(getUserId())) { |
|
|
|
if (!wxCouponOrderCVo.getCUserId().equals(user.getUserId())) { |
|
|
|
return new ResultData(ErrorCode.COUPON_ORDER_IS_NULL); |
|
|
|
} |
|
|
|
WxCouponCVo wxCouponCVo = null; |
|
|
|
@@ -237,6 +246,11 @@ public class WxCouponOrderController extends BaseController { |
|
|
|
@ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true), |
|
|
|
}) |
|
|
|
public ResultData cardList(@ModelAttribute WxCardCVo cardCVo, Integer pageNum, Integer pageSize) { |
|
|
|
WxCUser user = getUser(); |
|
|
|
if (user.getUserId() == null) { |
|
|
|
logger.error("手机号为空,请授权手机号"); |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "手机号为空,请授权手机号"); |
|
|
|
} |
|
|
|
|
|
|
|
if (pageNum == null || pageSize == null) { |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); |
|
|
|
@@ -245,7 +259,7 @@ public class WxCouponOrderController extends BaseController { |
|
|
|
cardCVo = new WxCardCVo(); |
|
|
|
} |
|
|
|
cardCVo.updateTenantInfo(getTenantInfo()); |
|
|
|
cardCVo.setOwnerId(getUserId()); |
|
|
|
cardCVo.setOwnerId(user.getUserId()); |
|
|
|
if(StringUtils.isNotBlank(cardCVo.getStatusStr())) { |
|
|
|
String [] statusAttr = cardCVo.getStatusStr().split(","); |
|
|
|
List<Integer> tmpList = new ArrayList<Integer>(); |
|
|
|
@@ -272,12 +286,16 @@ public class WxCouponOrderController extends BaseController { |
|
|
|
@ApiImplicitParam(name = "couponOrderId", value = "券ID", dataType = "string", paramType = "query", required = true) |
|
|
|
}) |
|
|
|
public ResultData cardDetail(String couponOrderId) { |
|
|
|
|
|
|
|
WxCUser user = getUser(); |
|
|
|
if (user.getUserId() == null) { |
|
|
|
logger.error("手机号为空,请授权手机号"); |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "手机号为空,请授权手机号"); |
|
|
|
} |
|
|
|
if (couponOrderId == null || couponOrderId.equalsIgnoreCase(Constant.UNDEFINED) ) { |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); |
|
|
|
} |
|
|
|
|
|
|
|
return wxCouponOrderService.cardDetailCUserVo(getUserId(), couponOrderId); |
|
|
|
return wxCouponOrderService.cardDetailCUserVo(user.getUserId(), couponOrderId); |
|
|
|
} |
|
|
|
|
|
|
|
@ApiOperation(value = "卡转赠领取") |
|
|
|
@@ -287,6 +305,11 @@ public class WxCouponOrderController extends BaseController { |
|
|
|
@ApiImplicitParam(name = "cUserId", value = "转赠者", dataType = "Long", paramType = "query", required = true), |
|
|
|
}) |
|
|
|
public ResultData cardAccept(@RequestBody WxCouponOrder wxCouponOrder) { |
|
|
|
WxCUser user = getUser(); |
|
|
|
if (user.getUserId() == null) { |
|
|
|
logger.error("手机号为空,请授权手机号"); |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "手机号为空,请授权手机号"); |
|
|
|
} |
|
|
|
//coupon_order_id判断 |
|
|
|
Long id = wxCouponOrder.getId(); |
|
|
|
if (id == null) { |
|
|
|
@@ -298,7 +321,7 @@ public class WxCouponOrderController extends BaseController { |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "cUserId不能为空"); |
|
|
|
} |
|
|
|
//当前领取人 |
|
|
|
wxCouponOrder.setOwnerId(getUserId()); |
|
|
|
wxCouponOrder.setOwnerId(user.getUserId()); |
|
|
|
//转赠者与当前领取人是否为同一个 |
|
|
|
if (cUserId.equals(wxCouponOrder.getOwnerId())) { |
|
|
|
logger.info("转赠人与卡所有者相同"); |
|
|
|
@@ -316,7 +339,11 @@ public class WxCouponOrderController extends BaseController { |
|
|
|
@ApiImplicitParam(name = "cUserId", value = "转赠者", dataType = "Long", paramType = "query", required = true), |
|
|
|
}) |
|
|
|
public ResultData queryCardStatus(@ModelAttribute WxCouponOrder wxCouponOrder) { |
|
|
|
|
|
|
|
WxCUser user = getUser(); |
|
|
|
if (user.getUserId() == null) { |
|
|
|
logger.error("手机号为空,请授权手机号"); |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "手机号为空,请授权手机号"); |
|
|
|
} |
|
|
|
//coupon_order_id判断 |
|
|
|
Long id = wxCouponOrder.getId(); |
|
|
|
if (id == null) { |
|
|
|
@@ -332,7 +359,7 @@ public class WxCouponOrderController extends BaseController { |
|
|
|
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "updateDate不能为空"); |
|
|
|
} |
|
|
|
//当前领取人 |
|
|
|
wxCouponOrder.setOwnerId(getUserId()); |
|
|
|
wxCouponOrder.setOwnerId(user.getUserId()); |
|
|
|
return wxCouponOrderService.queryCardStatus(wxCouponOrder); |
|
|
|
} |
|
|
|
|
|
|
|
|