| @@ -149,7 +149,7 @@ public class BaseController { | |||||
| return; | return; | ||||
| WxCUserBasicInfo byId = null; | WxCUserBasicInfo byId = null; | ||||
| if(user.getUserId() != null){ | |||||
| if(user.isBasicInfo()){ | |||||
| byId = wxCUserBasicInfoService.getById(user.getUserId()); | byId = wxCUserBasicInfoService.getById(user.getUserId()); | ||||
| } | } | ||||
| @@ -39,9 +39,9 @@ public class WxActivityController extends BaseController { | |||||
| @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) | @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) | ||||
| public ResultData queryStatus(Long id) { | public ResultData queryStatus(Long id) { | ||||
| WxCUser user = getUser(); | WxCUser user = getUser(); | ||||
| if (user.getUserId() == null) { | |||||
| logger.error("手机号为空,请授权手机号"); | |||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "手机号为空,请授权手机号"); | |||||
| if (!user.isBasicInfo()) { | |||||
| logger.error("暂未成为会员,请授权手机号"); | |||||
| return new ResultData(ErrorCode.USER_IS_NOT_MEMBER.getCode(), "暂未成为会员,请授权手机号"); | |||||
| } | } | ||||
| return new ResultData(wxActivityService.queryStatus(id, user.getUserId())); | return new ResultData(wxActivityService.queryStatus(id, user.getUserId())); | ||||
| } | } | ||||
| @@ -51,9 +51,9 @@ public class WxActivityController extends BaseController { | |||||
| @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) | @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true) | ||||
| public ResultData findById(Long id) { | public ResultData findById(Long id) { | ||||
| WxCUser user = getUser(); | WxCUser user = getUser(); | ||||
| if (user.getUserId() == null) { | |||||
| logger.error("手机号为空,请授权手机号"); | |||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "手机号为空,请授权手机号"); | |||||
| if (!user.isBasicInfo()) { | |||||
| logger.error("暂未成为会员,请授权手机号"); | |||||
| return new ResultData(ErrorCode.USER_IS_NOT_MEMBER.getCode(), "暂未成为会员,请授权手机号"); | |||||
| } | } | ||||
| WxActivity wxActivity = wxActivityService.getById(id); | WxActivity wxActivity = wxActivityService.getById(id); | ||||
| Integer status = wxActivityService.queryStatus(id, user.getUserId()); | Integer status = wxActivityService.queryStatus(id, user.getUserId()); | ||||
| @@ -43,9 +43,9 @@ public class WxActivityJoinController extends BaseController { | |||||
| @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) | @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) | ||||
| public ResultData list(@ModelAttribute WxActivityJoin wxActivityJoin, Integer pageNum, Integer pageSize) { | public ResultData list(@ModelAttribute WxActivityJoin wxActivityJoin, Integer pageNum, Integer pageSize) { | ||||
| WxCUser user = getUser(); | WxCUser user = getUser(); | ||||
| if (user.getUserId() == null) { | |||||
| logger.error("手机号为空,请授权手机号"); | |||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "手机号为空,请授权手机号"); | |||||
| if (!user.isBasicInfo()) { | |||||
| logger.error("暂未成为会员,请授权手机号"); | |||||
| return new ResultData(ErrorCode.USER_IS_NOT_MEMBER.getCode(), "暂未成为会员,请授权手机号"); | |||||
| } | } | ||||
| if (null == wxActivityJoin) wxActivityJoin = new WxActivityJoin(); | if (null == wxActivityJoin) wxActivityJoin = new WxActivityJoin(); | ||||
| wxActivityJoin.updateTenantInfo(getTenantInfo()); | wxActivityJoin.updateTenantInfo(getTenantInfo()); | ||||
| @@ -59,9 +59,9 @@ public class WxActivityJoinController extends BaseController { | |||||
| @PostMapping("join") | @PostMapping("join") | ||||
| public ResultData join(@RequestBody WxActivityJoin wxActivityJoin) { | public ResultData join(@RequestBody WxActivityJoin wxActivityJoin) { | ||||
| WxCUser user = getUser(); | WxCUser user = getUser(); | ||||
| if (user.getUserId() == null) { | |||||
| logger.error("手机号为空,请授权手机号"); | |||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "手机号为空,请授权手机号"); | |||||
| if (!user.isBasicInfo()) { | |||||
| logger.error("暂未成为会员,请授权手机号"); | |||||
| return new ResultData(ErrorCode.USER_IS_NOT_MEMBER.getCode(), "暂未成为会员,请授权手机号"); | |||||
| } | } | ||||
| if (wxActivityJoin.getActivityId() == null) { | if (wxActivityJoin.getActivityId() == null) { | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "activityId不能为空"); | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "activityId不能为空"); | ||||
| @@ -86,9 +86,9 @@ public class WxActivityJoinController extends BaseController { | |||||
| @PostMapping("sign") | @PostMapping("sign") | ||||
| public ResultData sign(@RequestBody WxActivityJoin wxActivityJoin) { | public ResultData sign(@RequestBody WxActivityJoin wxActivityJoin) { | ||||
| WxCUser user = getUser(); | WxCUser user = getUser(); | ||||
| if (user.getUserId() == null) { | |||||
| logger.error("手机号为空,请授权手机号"); | |||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "手机号为空,请授权手机号"); | |||||
| if (!user.isBasicInfo()) { | |||||
| logger.error("暂未成为会员,请授权手机号"); | |||||
| return new ResultData(ErrorCode.USER_IS_NOT_MEMBER.getCode(), "暂未成为会员,请授权手机号"); | |||||
| } | } | ||||
| if (wxActivityJoin.getActivityId() == null) { | if (wxActivityJoin.getActivityId() == null) { | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "activityId不能为空"); | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "activityId不能为空"); | ||||
| @@ -102,9 +102,9 @@ public class WxCarController extends BaseController { | |||||
| @PostMapping("/init") | @PostMapping("/init") | ||||
| public ResultData init(@RequestBody Map<String, String> paramMap) { | public ResultData init(@RequestBody Map<String, String> paramMap) { | ||||
| WxCUser user = getUser(); | WxCUser user = getUser(); | ||||
| if (user.getUserId() == null) { | |||||
| logger.error("手机号为空,请授权手机号"); | |||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "手机号为空,请授权手机号"); | |||||
| if (!user.isBasicInfo()) { | |||||
| logger.error("暂未成为会员,请授权手机号"); | |||||
| return new ResultData(ErrorCode.USER_IS_NOT_MEMBER.getCode(), "暂未成为会员,请授权手机号"); | |||||
| } | } | ||||
| // 1, get mall's park | // 1, get mall's park | ||||
| WxPark park = getCurrentPark(getTenantInfo()); | WxPark park = getCurrentPark(getTenantInfo()); | ||||
| @@ -126,8 +126,8 @@ public class WxCarController extends BaseController { | |||||
| String phone = paramMap.get("phone"); | String phone = paramMap.get("phone"); | ||||
| WxCUserBasicInfo user = wxCUserBasicInfoService.getById(userId); | WxCUserBasicInfo user = wxCUserBasicInfoService.getById(userId); | ||||
| if (StringUtils.isBlank(phone) && StringUtils.isBlank(user.getPhone())) { | if (StringUtils.isBlank(phone) && StringUtils.isBlank(user.getPhone())) { | ||||
| logger.error("手机号为空,请授权手机号"); | |||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "手机号为空,请授权手机号"); | |||||
| logger.error("暂未成为会员,请授权手机号"); | |||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "暂未成为会员,请授权手机号"); | |||||
| } | } | ||||
| if (!StringUtils.isBlank(user.getPhone()) && !user.getPhone().contains("*")) { | if (!StringUtils.isBlank(user.getPhone()) && !user.getPhone().contains("*")) { | ||||
| phone = user.getPhone(); | phone = user.getPhone(); | ||||
| @@ -262,9 +262,9 @@ public class WxCarController extends BaseController { | |||||
| @PostMapping("/bindCar") | @PostMapping("/bindCar") | ||||
| public ResultData bindCar(@RequestBody Map<String, String> paramMap) { | public ResultData bindCar(@RequestBody Map<String, String> paramMap) { | ||||
| WxCUser user = getUser(); | WxCUser user = getUser(); | ||||
| if (user.getUserId() == null) { | |||||
| logger.error("手机号为空,请授权手机号"); | |||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "手机号为空,请授权手机号"); | |||||
| if (!user.isBasicInfo()) { | |||||
| logger.error("暂未成为会员,请授权手机号"); | |||||
| return new ResultData(ErrorCode.USER_IS_NOT_MEMBER.getCode(), "暂未成为会员,请授权手机号"); | |||||
| } | } | ||||
| // 1, get mall's park | // 1, get mall's park | ||||
| WxPark park = getCurrentPark(getTenantInfo()); | WxPark park = getCurrentPark(getTenantInfo()); | ||||
| @@ -272,7 +272,7 @@ public class WxCarController extends BaseController { | |||||
| if (park.getVendorType() == EnumCarVendor.CAR_ETCP.getCode()) { | if (park.getVendorType() == EnumCarVendor.CAR_ETCP.getCode()) { | ||||
| return etcpBindCar(paramMap, park, user.getUserId()); | return etcpBindCar(paramMap, park, user.getUserId()); | ||||
| } else if (park.getVendorType() == EnumCarVendor.CAE_CYF.getCode()){ | } else if (park.getVendorType() == EnumCarVendor.CAE_CYF.getCode()){ | ||||
| return cyfBindCar(paramMap,park,getUser()); | |||||
| return cyfBindCar(paramMap,park,user); | |||||
| } else { | } else { | ||||
| // 内部操作 | // 内部操作 | ||||
| return bindCar(paramMap, park, user.getUserId()); | return bindCar(paramMap, park, user.getUserId()); | ||||
| @@ -472,9 +472,9 @@ public class WxCarController extends BaseController { | |||||
| @PostMapping("/unbindCar") | @PostMapping("/unbindCar") | ||||
| public ResultData unbindCar(@RequestBody Map<String, String> paramMap) { | public ResultData unbindCar(@RequestBody Map<String, String> paramMap) { | ||||
| WxCUser user = getUser(); | WxCUser user = getUser(); | ||||
| if (user.getUserId() == null) { | |||||
| logger.error("手机号为空,请授权手机号"); | |||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "手机号为空,请授权手机号"); | |||||
| if (!user.isBasicInfo()) { | |||||
| logger.error("暂未成为会员,请授权手机号"); | |||||
| return new ResultData(ErrorCode.USER_IS_NOT_MEMBER.getCode(), "暂未成为会员,请授权手机号"); | |||||
| } | } | ||||
| // 1, get mall's park | // 1, get mall's park | ||||
| @@ -799,9 +799,9 @@ public class WxCarController extends BaseController { | |||||
| @PostMapping("/getCoupon") | @PostMapping("/getCoupon") | ||||
| public ResultData getCoupon(@RequestBody Map<String, String> paramMap) { | public ResultData getCoupon(@RequestBody Map<String, String> paramMap) { | ||||
| WxCUser user = getUser(); | WxCUser user = getUser(); | ||||
| if (user.getUserId() == null) { | |||||
| logger.error("手机号为空,请授权手机号"); | |||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "手机号为空,请授权手机号"); | |||||
| if (!user.isBasicInfo()) { | |||||
| logger.error("暂未成为会员,请授权手机号"); | |||||
| return new ResultData(ErrorCode.USER_IS_NOT_MEMBER.getCode(), "暂未成为会员,请授权手机号"); | |||||
| } | } | ||||
| /// 1, get mall's park | /// 1, get mall's park | ||||
| WxPark park = getCurrentPark(getTenantInfo()); | WxPark park = getCurrentPark(getTenantInfo()); | ||||
| @@ -998,9 +998,9 @@ public class WxCarController extends BaseController { | |||||
| }) | }) | ||||
| public ResultData list(@ModelAttribute WxCouponOrder wxCouponOrder, Integer pageNum, Integer pageSize) { | public ResultData list(@ModelAttribute WxCouponOrder wxCouponOrder, Integer pageNum, Integer pageSize) { | ||||
| WxCUser user = getUser(); | WxCUser user = getUser(); | ||||
| if (user.getUserId() == null) { | |||||
| logger.error("手机号为空,请授权手机号"); | |||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "手机号为空,请授权手机号"); | |||||
| if (!user.isBasicInfo()) { | |||||
| logger.error("暂未成为会员,请授权手机号"); | |||||
| return new ResultData(ErrorCode.USER_IS_NOT_MEMBER.getCode(), "暂未成为会员,请授权手机号"); | |||||
| } | } | ||||
| if (pageNum == null || pageSize == null) { | if (pageNum == null || pageSize == null) { | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); | ||||
| @@ -60,9 +60,9 @@ public class WxCardPayController extends BaseController { | |||||
| logger.info("saveCardPayOrder: " + ipStr + " :" + paramMap.toString()); | logger.info("saveCardPayOrder: " + ipStr + " :" + paramMap.toString()); | ||||
| WxCUser user = getUser(); | WxCUser user = getUser(); | ||||
| if (user.getUserId() == null) { | |||||
| logger.error("手机号为空,请授权手机号"); | |||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "手机号为空,请授权手机号"); | |||||
| if (!user.isBasicInfo()) { | |||||
| logger.error("暂未成为会员,请授权手机号"); | |||||
| return new ResultData(ErrorCode.USER_IS_NOT_MEMBER.getCode(), "暂未成为会员,请授权手机号"); | |||||
| } | } | ||||
| WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoService.getById(user.getUserId()); | WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoService.getById(user.getUserId()); | ||||
| if (null != wxCUserBasicInfo && EnumCreditLockedStatus.CLOSE.getCode().equals(wxCUserBasicInfo.getStatus())) { | if (null != wxCUserBasicInfo && EnumCreditLockedStatus.CLOSE.getCode().equals(wxCUserBasicInfo.getStatus())) { | ||||
| @@ -176,9 +176,9 @@ public class WxCardPayController extends BaseController { | |||||
| String ipStr = getIpAddr(); | String ipStr = getIpAddr(); | ||||
| logger.info("list: " + ipStr + " :" + wxCardSpend.toString()); | logger.info("list: " + ipStr + " :" + wxCardSpend.toString()); | ||||
| WxCUser user = getUser(); | WxCUser user = getUser(); | ||||
| if (user.getUserId() == null) { | |||||
| logger.error("手机号为空,请授权手机号"); | |||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "手机号为空,请授权手机号"); | |||||
| if (!user.isBasicInfo()) { | |||||
| logger.error("暂未成为会员,请授权手机号"); | |||||
| return new ResultData(ErrorCode.USER_IS_NOT_MEMBER.getCode(), "暂未成为会员,请授权手机号"); | |||||
| } | } | ||||
| if (wxCardSpend == null) wxCardSpend = new WxCardSpendVo(); | if (wxCardSpend == null) wxCardSpend = new WxCardSpendVo(); | ||||
| wxCardSpend.updateTenantInfo(getTenantInfo()); | wxCardSpend.updateTenantInfo(getTenantInfo()); | ||||
| @@ -193,9 +193,9 @@ public class WxCardPayController extends BaseController { | |||||
| String ipStr = getIpAddr(); | String ipStr = getIpAddr(); | ||||
| logger.info("sumCardSpendList: " + ipStr + " :" + wxCardSpend.toString()); | logger.info("sumCardSpendList: " + ipStr + " :" + wxCardSpend.toString()); | ||||
| WxCUser user = getUser(); | WxCUser user = getUser(); | ||||
| if (user.getUserId() == null) { | |||||
| logger.error("手机号为空,请授权手机号"); | |||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "手机号为空,请授权手机号"); | |||||
| if (!user.isBasicInfo()) { | |||||
| logger.error("暂未成为会员,请授权手机号"); | |||||
| return new ResultData(ErrorCode.USER_IS_NOT_MEMBER.getCode(), "暂未成为会员,请授权手机号"); | |||||
| } | } | ||||
| if (wxCardSpend == null) wxCardSpend = new WxCardSpendVo(); | if (wxCardSpend == null) wxCardSpend = new WxCardSpendVo(); | ||||
| wxCardSpend.updateTenantInfo(getTenantInfo()); | wxCardSpend.updateTenantInfo(getTenantInfo()); | ||||
| @@ -66,9 +66,9 @@ public class WxCouponOrderController extends BaseController { | |||||
| }) | }) | ||||
| public ResultData list(@ModelAttribute WxCouponOrder wxCouponOrder, Integer pageNum, Integer pageSize) { | public ResultData list(@ModelAttribute WxCouponOrder wxCouponOrder, Integer pageNum, Integer pageSize) { | ||||
| WxCUser user = getUser(); | WxCUser user = getUser(); | ||||
| if (user.getUserId() == null) { | |||||
| logger.error("手机号为空,请授权手机号"); | |||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "手机号为空,请授权手机号"); | |||||
| if (!user.isBasicInfo()) { | |||||
| logger.error("暂未成为会员,请授权手机号"); | |||||
| return new ResultData(ErrorCode.USER_IS_NOT_MEMBER.getCode(), "暂未成为会员,请授权手机号"); | |||||
| } | } | ||||
| if (pageNum == null || pageSize == null) { | if (pageNum == null || pageSize == null) { | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); | ||||
| @@ -108,9 +108,9 @@ public class WxCouponOrderController extends BaseController { | |||||
| }) | }) | ||||
| public ResultData detail(String couponOrderId) { | public ResultData detail(String couponOrderId) { | ||||
| WxCUser user = getUser(); | WxCUser user = getUser(); | ||||
| if (user.getUserId() == null) { | |||||
| logger.error("手机号为空,请授权手机号"); | |||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "手机号为空,请授权手机号"); | |||||
| if (!user.isBasicInfo()) { | |||||
| logger.error("暂未成为会员,请授权手机号"); | |||||
| return new ResultData(ErrorCode.USER_IS_NOT_MEMBER.getCode(), "暂未成为会员,请授权手机号"); | |||||
| } | } | ||||
| if (couponOrderId == null || couponOrderId.equalsIgnoreCase(Constant.UNDEFINED)) { | if (couponOrderId == null || couponOrderId.equalsIgnoreCase(Constant.UNDEFINED)) { | ||||
| @@ -247,9 +247,9 @@ public class WxCouponOrderController extends BaseController { | |||||
| }) | }) | ||||
| public ResultData cardList(@ModelAttribute WxCardCVo cardCVo, Integer pageNum, Integer pageSize) { | public ResultData cardList(@ModelAttribute WxCardCVo cardCVo, Integer pageNum, Integer pageSize) { | ||||
| WxCUser user = getUser(); | WxCUser user = getUser(); | ||||
| if (user.getUserId() == null) { | |||||
| logger.error("手机号为空,请授权手机号"); | |||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "手机号为空,请授权手机号"); | |||||
| if (!user.isBasicInfo()) { | |||||
| logger.error("暂未成为会员,请授权手机号"); | |||||
| return new ResultData(ErrorCode.USER_IS_NOT_MEMBER.getCode(), "暂未成为会员,请授权手机号"); | |||||
| } | } | ||||
| if (pageNum == null || pageSize == null) { | if (pageNum == null || pageSize == null) { | ||||
| @@ -287,9 +287,9 @@ public class WxCouponOrderController extends BaseController { | |||||
| }) | }) | ||||
| public ResultData cardDetail(String couponOrderId) { | public ResultData cardDetail(String couponOrderId) { | ||||
| WxCUser user = getUser(); | WxCUser user = getUser(); | ||||
| if (user.getUserId() == null) { | |||||
| logger.error("手机号为空,请授权手机号"); | |||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "手机号为空,请授权手机号"); | |||||
| if (!user.isBasicInfo()) { | |||||
| logger.error("暂未成为会员,请授权手机号"); | |||||
| return new ResultData(ErrorCode.USER_IS_NOT_MEMBER.getCode(), "暂未成为会员,请授权手机号"); | |||||
| } | } | ||||
| if (couponOrderId == null || couponOrderId.equalsIgnoreCase(Constant.UNDEFINED) ) { | if (couponOrderId == null || couponOrderId.equalsIgnoreCase(Constant.UNDEFINED) ) { | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); | ||||
| @@ -306,9 +306,9 @@ public class WxCouponOrderController extends BaseController { | |||||
| }) | }) | ||||
| public ResultData cardAccept(@RequestBody WxCouponOrder wxCouponOrder) { | public ResultData cardAccept(@RequestBody WxCouponOrder wxCouponOrder) { | ||||
| WxCUser user = getUser(); | WxCUser user = getUser(); | ||||
| if (user.getUserId() == null) { | |||||
| logger.error("手机号为空,请授权手机号"); | |||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "手机号为空,请授权手机号"); | |||||
| if (!user.isBasicInfo()) { | |||||
| logger.error("暂未成为会员,请授权手机号"); | |||||
| return new ResultData(ErrorCode.USER_IS_NOT_MEMBER.getCode(), "暂未成为会员,请授权手机号"); | |||||
| } | } | ||||
| //coupon_order_id判断 | //coupon_order_id判断 | ||||
| Long id = wxCouponOrder.getId(); | Long id = wxCouponOrder.getId(); | ||||
| @@ -340,9 +340,9 @@ public class WxCouponOrderController extends BaseController { | |||||
| }) | }) | ||||
| public ResultData queryCardStatus(@ModelAttribute WxCouponOrder wxCouponOrder) { | public ResultData queryCardStatus(@ModelAttribute WxCouponOrder wxCouponOrder) { | ||||
| WxCUser user = getUser(); | WxCUser user = getUser(); | ||||
| if (user.getUserId() == null) { | |||||
| logger.error("手机号为空,请授权手机号"); | |||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "手机号为空,请授权手机号"); | |||||
| if (!user.isBasicInfo()) { | |||||
| logger.error("暂未成为会员,请授权手机号"); | |||||
| return new ResultData(ErrorCode.USER_IS_NOT_MEMBER.getCode(), "暂未成为会员,请授权手机号"); | |||||
| } | } | ||||
| //coupon_order_id判断 | //coupon_order_id判断 | ||||
| Long id = wxCouponOrder.getId(); | Long id = wxCouponOrder.getId(); | ||||
| @@ -64,10 +64,11 @@ public class WxCouponPasswordController extends BaseController { | |||||
| WxCUser cuUser = getUser(); | WxCUser cuUser = getUser(); | ||||
| if (null == cuUser ) { | if (null == cuUser ) { | ||||
| return new ResultData(ErrorCode.USER_IS_EMPTY.getCode(), "用户信息失效,请重新登陆"); | return new ResultData(ErrorCode.USER_IS_EMPTY.getCode(), "用户信息失效,请重新登陆"); | ||||
| } | |||||
| if(!cuUser.isBasicInfo()) { | |||||
| return new ResultData(ErrorCode.USER_IS_NOT_MEMBER); | |||||
| } | |||||
| if (!cuUser.isBasicInfo()) { | |||||
| logger.error("暂未成为会员,请授权手机号"); | |||||
| return new ResultData(ErrorCode.USER_IS_NOT_MEMBER.getCode(), "暂未成为会员,请授权手机号"); | |||||
| } | } | ||||
| WxCUserBasicInfo user = userService.getById(cuUser.getUserId()); | WxCUserBasicInfo user = userService.getById(cuUser.getUserId()); | ||||
| @@ -1,7 +1,9 @@ | |||||
| package com.iformall.controller; | package com.iformall.controller; | ||||
| import com.github.pagehelper.PageInfo; | import com.github.pagehelper.PageInfo; | ||||
| import com.iformall.common.ErrorCode; | |||||
| import com.iformall.common.ResultData; | import com.iformall.common.ResultData; | ||||
| import com.iformall.domain.po.WxCUser; | |||||
| import com.iformall.domain.po.base.BaseEntity; | import com.iformall.domain.po.base.BaseEntity; | ||||
| import com.iformall.domain.po.WxCreditHistory; | import com.iformall.domain.po.WxCreditHistory; | ||||
| import com.iformall.service.WxCreditHistoryService; | import com.iformall.service.WxCreditHistoryService; | ||||
| @@ -10,6 +12,8 @@ import io.swagger.annotations.ApiImplicitParam; | |||||
| import io.swagger.annotations.ApiImplicitParams; | import io.swagger.annotations.ApiImplicitParams; | ||||
| import io.swagger.annotations.ApiOperation; | import io.swagger.annotations.ApiOperation; | ||||
| import lombok.extern.slf4j.Slf4j; | import lombok.extern.slf4j.Slf4j; | ||||
| import org.slf4j.Logger; | |||||
| import org.slf4j.LoggerFactory; | |||||
| import org.springframework.beans.factory.annotation.Autowired; | import org.springframework.beans.factory.annotation.Autowired; | ||||
| import org.springframework.web.bind.annotation.*; | import org.springframework.web.bind.annotation.*; | ||||
| @@ -19,6 +23,8 @@ import org.springframework.web.bind.annotation.*; | |||||
| @Slf4j | @Slf4j | ||||
| public class WxCreditHistoryController extends BaseController{ | public class WxCreditHistoryController extends BaseController{ | ||||
| private final Logger logger = LoggerFactory.getLogger(this.getClass()); | |||||
| @Autowired | @Autowired | ||||
| private WxCreditHistoryService wxCreditHistoryService; | private WxCreditHistoryService wxCreditHistoryService; | ||||
| @@ -30,7 +36,12 @@ public class WxCreditHistoryController extends BaseController{ | |||||
| public ResultData list(@ModelAttribute WxCreditHistory wxCreditHistory, Integer pageNum, Integer pageSize) { | public ResultData list(@ModelAttribute WxCreditHistory wxCreditHistory, Integer pageNum, Integer pageSize) { | ||||
| log.debug("[" + getIpAddr() + "] WxCreditHistoryController::list"); | log.debug("[" + getIpAddr() + "] WxCreditHistoryController::list"); | ||||
| if (null == wxCreditHistory) wxCreditHistory = new WxCreditHistory(); | if (null == wxCreditHistory) wxCreditHistory = new WxCreditHistory(); | ||||
| wxCreditHistory.setCUserId(getUserId()); | |||||
| WxCUser user = getUser(); | |||||
| if (!user.isBasicInfo()) { | |||||
| logger.error("暂未成为会员,请授权手机号"); | |||||
| return new ResultData(ErrorCode.USER_IS_NOT_MEMBER.getCode(), "暂未成为会员,请授权手机号"); | |||||
| } | |||||
| wxCreditHistory.setCUserId(user.getUserId()); | |||||
| wxCreditHistory.setSortColumns(BaseEntity.SortField.CreateDate_DESC,BaseEntity.SortField.Id_DESC); | wxCreditHistory.setSortColumns(BaseEntity.SortField.CreateDate_DESC,BaseEntity.SortField.Id_DESC); | ||||
| final PageInfo<WxCreditHistory> page = wxCreditHistoryService.listAsPage(wxCreditHistory, pageNum, pageSize); | final PageInfo<WxCreditHistory> page = wxCreditHistoryService.listAsPage(wxCreditHistory, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| @@ -4,10 +4,7 @@ import com.github.pagehelper.Page; | |||||
| import com.github.pagehelper.PageInfo; | import com.github.pagehelper.PageInfo; | ||||
| import com.iformall.common.ErrorCode; | import com.iformall.common.ErrorCode; | ||||
| import com.iformall.common.ResultData; | import com.iformall.common.ResultData; | ||||
| import com.iformall.domain.po.WxCouponOrder; | |||||
| import com.iformall.domain.po.WxGame; | |||||
| import com.iformall.domain.po.WxGameActionLog; | |||||
| import com.iformall.domain.po.WxGameTemplate; | |||||
| import com.iformall.domain.po.*; | |||||
| import com.iformall.enums.EnumGameStatus; | import com.iformall.enums.EnumGameStatus; | ||||
| import com.iformall.service.WxCouponOrderService; | import com.iformall.service.WxCouponOrderService; | ||||
| import com.iformall.service.WxGameService; | import com.iformall.service.WxGameService; | ||||
| @@ -74,6 +71,11 @@ public class WxGameController extends BaseController { | |||||
| public ResultData addActionLog(@RequestBody Map<String,String> paramMap) { | public ResultData addActionLog(@RequestBody Map<String,String> paramMap) { | ||||
| Long gameIdL = null; | Long gameIdL = null; | ||||
| Long orderIdL = null; | Long orderIdL = null; | ||||
| WxCUser user = getUser(); | |||||
| if (!user.isBasicInfo()) { | |||||
| logger.error("暂未成为会员,请授权手机号"); | |||||
| return new ResultData(ErrorCode.USER_IS_NOT_MEMBER.getCode(), "暂未成为会员,请授权手机号"); | |||||
| } | |||||
| try { | try { | ||||
| gameIdL = Long.valueOf(paramMap.get("gameId")); | gameIdL = Long.valueOf(paramMap.get("gameId")); | ||||
| @@ -82,7 +84,7 @@ public class WxGameController extends BaseController { | |||||
| return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); | return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); | ||||
| } | } | ||||
| return wxGameService.addActionLog(getUserId(), gameIdL, orderIdL); | |||||
| return wxGameService.addActionLog(user.getUserId(), gameIdL, orderIdL); | |||||
| } | } | ||||
| @ApiOperation("添加游戏参与记录") | @ApiOperation("添加游戏参与记录") | ||||
| @@ -90,6 +92,11 @@ public class WxGameController extends BaseController { | |||||
| @ApiImplicitParams({ | @ApiImplicitParams({ | ||||
| @ApiImplicitParam(name = "gameId", value = "游戏ID", dataType = "String", paramType = "query", required = true)}) | @ApiImplicitParam(name = "gameId", value = "游戏ID", dataType = "String", paramType = "query", required = true)}) | ||||
| public ResultData getCount(String gameId) { | public ResultData getCount(String gameId) { | ||||
| WxCUser user = getUser(); | |||||
| if (!user.isBasicInfo()) { | |||||
| logger.error("暂未成为会员,请授权手机号"); | |||||
| return new ResultData(ErrorCode.USER_IS_NOT_MEMBER.getCode(), "暂未成为会员,请授权手机号"); | |||||
| } | |||||
| Long gameIdL = null; | Long gameIdL = null; | ||||
| try { | try { | ||||
| gameIdL = Long.valueOf(gameId); | gameIdL = Long.valueOf(gameId); | ||||
| @@ -97,6 +104,6 @@ public class WxGameController extends BaseController { | |||||
| return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); | return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); | ||||
| } | } | ||||
| return wxGameService.getCount(gameIdL,getUserId()); | |||||
| return wxGameService.getCount(gameIdL,user.getUserId()); | |||||
| } | } | ||||
| } | } | ||||
| @@ -3,6 +3,7 @@ package com.iformall.controller; | |||||
| import com.github.pagehelper.PageInfo; | import com.github.pagehelper.PageInfo; | ||||
| import com.iformall.common.ErrorCode; | import com.iformall.common.ErrorCode; | ||||
| import com.iformall.common.ResultData; | import com.iformall.common.ResultData; | ||||
| import com.iformall.domain.po.WxCUser; | |||||
| import com.iformall.domain.po.WxOrder; | import com.iformall.domain.po.WxOrder; | ||||
| import com.iformall.domain.po.WxOrderGroup; | import com.iformall.domain.po.WxOrderGroup; | ||||
| import com.iformall.domain.vo.WxOrderGroupMarketing; | import com.iformall.domain.vo.WxOrderGroupMarketing; | ||||
| @@ -43,13 +44,18 @@ public class WxOrderGroupController extends BaseController { | |||||
| @ApiImplicitParam(name = "couponId", value = "券ID", dataType = "Long", paramType = "query", required = true) | @ApiImplicitParam(name = "couponId", value = "券ID", dataType = "Long", paramType = "query", required = true) | ||||
| }) | }) | ||||
| public ResultData queryRemainOne(@ModelAttribute WxOrderGroup wxOrderGroup) { | public ResultData queryRemainOne(@ModelAttribute WxOrderGroup wxOrderGroup) { | ||||
| WxCUser user = getUser(); | |||||
| Long userId = Long.valueOf(-1); | |||||
| if (user.isBasicInfo()) { | |||||
| userId = user.getUserId(); | |||||
| } | |||||
| if (wxOrderGroup.getCouponId() == null) { | if (wxOrderGroup.getCouponId() == null) { | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "couponId不能为空"); | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "couponId不能为空"); | ||||
| } | } | ||||
| wxOrderGroup.setRemainPeople(1); | wxOrderGroup.setRemainPeople(1); | ||||
| wxOrderGroup.setStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING.getCode()); | wxOrderGroup.setStatus(EnumOrderStatus.ORDER_STATUS_COOPERATING.getCode()); | ||||
| wxOrderGroup.updateTenantInfo(getTenantInfo()); | wxOrderGroup.updateTenantInfo(getTenantInfo()); | ||||
| return wxOrderGroupService.queryRemainOne(wxOrderGroup, getUserId()); | |||||
| return wxOrderGroupService.queryRemainOne(wxOrderGroup, userId); | |||||
| } | } | ||||
| @@ -60,8 +66,13 @@ public class WxOrderGroupController extends BaseController { | |||||
| @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true), | @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true), | ||||
| }) | }) | ||||
| public ResultData queryOrderGroup(Integer pageNum, Integer pageSize) { | public ResultData queryOrderGroup(Integer pageNum, Integer pageSize) { | ||||
| WxCUser user = getUser(); | |||||
| if (!user.isBasicInfo()) { | |||||
| logger.error("暂未成为会员,请授权手机号"); | |||||
| return new ResultData(ErrorCode.USER_IS_NOT_MEMBER.getCode(), "暂未成为会员,请授权手机号"); | |||||
| } | |||||
| WxOrder wxOrder = new WxOrder(); | WxOrder wxOrder = new WxOrder(); | ||||
| wxOrder.setCUserId(getUserId()); | |||||
| wxOrder.setCUserId(user.getUserId()); | |||||
| wxOrder.updateTenantInfo(getTenantInfo()); | wxOrder.updateTenantInfo(getTenantInfo()); | ||||
| final PageInfo<Map<String, Object>> page = wxOrderGroupService.queryOrderGroup(wxOrder, pageNum, pageSize); | final PageInfo<Map<String, Object>> page = wxOrderGroupService.queryOrderGroup(wxOrder, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| @@ -115,10 +126,15 @@ public class WxOrderGroupController extends BaseController { | |||||
| @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true), | @ApiImplicitParam(name = "id", value = "id", dataType = "Long", paramType = "query", required = true), | ||||
| }) | }) | ||||
| public ResultData queryAttendStatus(@ModelAttribute WxOrderGroup wxOrderGroup) { | public ResultData queryAttendStatus(@ModelAttribute WxOrderGroup wxOrderGroup) { | ||||
| WxCUser user = getUser(); | |||||
| if (!user.isBasicInfo()) { | |||||
| logger.error("暂未成为会员,请授权手机号"); | |||||
| return new ResultData(ErrorCode.USER_IS_NOT_MEMBER.getCode(), "暂未成为会员,请授权手机号"); | |||||
| } | |||||
| if (wxOrderGroup.getId() == null) { | if (wxOrderGroup.getId() == null) { | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "id不能为空"); | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "id不能为空"); | ||||
| } | } | ||||
| wxOrderGroup.setUserId(getUserId()); | |||||
| wxOrderGroup.setUserId(user.getUserId()); | |||||
| wxOrderGroup.updateTenantInfo(getTenantInfo()); | wxOrderGroup.updateTenantInfo(getTenantInfo()); | ||||
| return wxOrderGroupService.queryAttendStatus(wxOrderGroup); | return wxOrderGroupService.queryAttendStatus(wxOrderGroup); | ||||
| } | } | ||||
| @@ -2,6 +2,7 @@ package com.iformall.controller; | |||||
| import com.iformall.common.ErrorCode; | import com.iformall.common.ErrorCode; | ||||
| import com.iformall.common.ResultData; | import com.iformall.common.ResultData; | ||||
| import com.iformall.domain.po.WxCUser; | |||||
| import com.iformall.domain.po.WxOrder; | import com.iformall.domain.po.WxOrder; | ||||
| import com.iformall.domain.po.WxOrderPress; | import com.iformall.domain.po.WxOrderPress; | ||||
| import com.iformall.domain.vo.WxCouponCVo; | import com.iformall.domain.vo.WxCouponCVo; | ||||
| @@ -153,8 +154,13 @@ public class WxPressOrderController extends BaseController { | |||||
| logger.error("此砍价订单被锁定, orderId: " + orderIdStr); | logger.error("此砍价订单被锁定, orderId: " + orderIdStr); | ||||
| return new ResultData(ErrorCode.TOO_MANY_REQUEST); | return new ResultData(ErrorCode.TOO_MANY_REQUEST); | ||||
| } | } | ||||
| WxCUser user = getUser(); | |||||
| if (!user.isBasicInfo()) { | |||||
| logger.error("暂未成为会员,请授权手机号"); | |||||
| return new ResultData(ErrorCode.USER_IS_NOT_MEMBER.getCode(), "暂未成为会员,请授权手机号"); | |||||
| } | |||||
| Long cUserId = getUserId(); | |||||
| Long cUserId = user.getUserId(); | |||||
| // 检查此人是否已参与砍价 | // 检查此人是否已参与砍价 | ||||
| boolean hadJoin = wxOrderPressService.checkCUserHasJoin(order, cUserId); | boolean hadJoin = wxOrderPressService.checkCUserHasJoin(order, cUserId); | ||||
| if (hadJoin) { | if (hadJoin) { | ||||
| @@ -226,6 +232,11 @@ public class WxPressOrderController extends BaseController { | |||||
| @GetMapping("getPressOrderStatus") | @GetMapping("getPressOrderStatus") | ||||
| @ApiImplicitParam(name = "orderId", value = "orderId", dataType = "String", paramType = "query", required = true) | @ApiImplicitParam(name = "orderId", value = "orderId", dataType = "String", paramType = "query", required = true) | ||||
| public ResultData getPressOrderStatus(String orderId) { | public ResultData getPressOrderStatus(String orderId) { | ||||
| WxCUser user = getUser(); | |||||
| if (!user.isBasicInfo()) { | |||||
| logger.error("暂未成为会员,请授权手机号"); | |||||
| return new ResultData(ErrorCode.USER_IS_NOT_MEMBER.getCode(), "暂未成为会员,请授权手机号"); | |||||
| } | |||||
| Map ret = new HashMap(); | Map ret = new HashMap(); | ||||
| if (StringUtils.isBlank(orderId)) { | if (StringUtils.isBlank(orderId)) { | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "orderId不能为空"); | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "orderId不能为空"); | ||||
| @@ -242,11 +253,11 @@ public class WxPressOrderController extends BaseController { | |||||
| logger.error("订单不存在:" + orderId); | logger.error("订单不存在:" + orderId); | ||||
| return new ResultData(ErrorCode.ORDER_IS_NOT_FIND); | return new ResultData(ErrorCode.ORDER_IS_NOT_FIND); | ||||
| } | } | ||||
| if(order.getCUserId().equals(getUserId())) { | |||||
| if(order.getCUserId().equals(user.getUserId())) { | |||||
| ret.put("status", EnumOrderPressStatus.FIRST.getCode()); | ret.put("status", EnumOrderPressStatus.FIRST.getCode()); | ||||
| return new ResultData(ret); | return new ResultData(ret); | ||||
| } | } | ||||
| int status = wxOrderPressService.pressCouponStatus(order, getUserId()); | |||||
| int status = wxOrderPressService.pressCouponStatus(order, user.getUserId()); | |||||
| ret.put("status", status); | ret.put("status", status); | ||||
| return new ResultData(ret); | return new ResultData(ret); | ||||
| } | } | ||||
| @@ -4,6 +4,7 @@ import com.alibaba.fastjson.JSONObject; | |||||
| import com.iformall.common.ErrorCode; | import com.iformall.common.ErrorCode; | ||||
| import com.iformall.common.Result; | import com.iformall.common.Result; | ||||
| import com.iformall.common.ResultData; | import com.iformall.common.ResultData; | ||||
| import com.iformall.domain.po.WxCUser; | |||||
| import com.iformall.domain.po.WxQuestion; | import com.iformall.domain.po.WxQuestion; | ||||
| import com.iformall.domain.po.WxQuestionConfig; | import com.iformall.domain.po.WxQuestionConfig; | ||||
| import com.iformall.domain.po.WxQuestionLog; | import com.iformall.domain.po.WxQuestionLog; | ||||
| @@ -42,6 +43,11 @@ public class WxQuestionController extends BaseController { | |||||
| @ApiOperation("查寻问券") | @ApiOperation("查寻问券") | ||||
| @GetMapping("getQuestion") | @GetMapping("getQuestion") | ||||
| public Result getQuestion(@RequestParam("couponType") String couponType) { | public Result getQuestion(@RequestParam("couponType") String couponType) { | ||||
| WxCUser user = getUser(); | |||||
| if (!user.isBasicInfo()) { | |||||
| logger.error("暂未成为会员,请授权手机号"); | |||||
| return new ResultData(ErrorCode.USER_IS_NOT_MEMBER.getCode(), "暂未成为会员,请授权手机号"); | |||||
| } | |||||
| WxQuestionConfig wxQuestionConfig = new WxQuestionConfig(); | WxQuestionConfig wxQuestionConfig = new WxQuestionConfig(); | ||||
| wxQuestionConfig.updateTenantInfo(getTenantInfo()); | wxQuestionConfig.updateTenantInfo(getTenantInfo()); | ||||
| JSONArray ct = new JSONArray(); | JSONArray ct = new JSONArray(); | ||||
| @@ -67,7 +73,7 @@ public class WxQuestionController extends BaseController { | |||||
| while(q.hasNext()){ | while(q.hasNext()){ | ||||
| WxQuestion x = q.next(); | WxQuestion x = q.next(); | ||||
| wxQuestionLog.setQuestionId(x.getId()); | wxQuestionLog.setQuestionId(x.getId()); | ||||
| wxQuestionLog.setUserId(getUserId()); | |||||
| wxQuestionLog.setUserId(user.getUserId()); | |||||
| wxQuestionLog.updateTenantInfo(wxQuestionConfig); | wxQuestionLog.updateTenantInfo(wxQuestionConfig); | ||||
| if(wxQuestionService.findLogList(wxQuestionLog).size()>0){ | if(wxQuestionService.findLogList(wxQuestionLog).size()>0){ | ||||
| @@ -87,6 +93,11 @@ public class WxQuestionController extends BaseController { | |||||
| @ApiOperation("设置问券配置") | @ApiOperation("设置问券配置") | ||||
| @PostMapping("answerQuestion") | @PostMapping("answerQuestion") | ||||
| public Result answerQuestion(@RequestBody WxQuestionLog wxQuestionLog) { | public Result answerQuestion(@RequestBody WxQuestionLog wxQuestionLog) { | ||||
| WxCUser user = getUser(); | |||||
| if (!user.isBasicInfo()) { | |||||
| logger.error("暂未成为会员,请授权手机号"); | |||||
| return new ResultData(ErrorCode.USER_IS_NOT_MEMBER.getCode(), "暂未成为会员,请授权手机号"); | |||||
| } | |||||
| if (wxQuestionLog == null) | if (wxQuestionLog == null) | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); | ||||
| if (wxQuestionLog.getQuestionId() == null) | if (wxQuestionLog.getQuestionId() == null) | ||||
| @@ -104,10 +115,10 @@ public class WxQuestionController extends BaseController { | |||||
| } | } | ||||
| wxQuestionLog.setAnswer(JSONObject.toJSONString(as)); | wxQuestionLog.setAnswer(JSONObject.toJSONString(as)); | ||||
| wxCUserTagsService.assignTags(as, wxCUserBasicInfoService.getById(getUserId())); | |||||
| wxCUserTagsService.assignTags(as, wxCUserBasicInfoService.getById(user.getUserId())); | |||||
| } | } | ||||
| wxQuestionLog.setUserId(getUserId()); | |||||
| wxQuestionLog.setUserId(user.getUserId()); | |||||
| wxQuestionService.saveOrUpdateLog(wxQuestionLog); | wxQuestionService.saveOrUpdateLog(wxQuestionLog); | ||||
| return new ResultData(); | return new ResultData(); | ||||
| @@ -1,7 +1,9 @@ | |||||
| package com.iformall.controller; | package com.iformall.controller; | ||||
| import com.github.pagehelper.PageInfo; | import com.github.pagehelper.PageInfo; | ||||
| import com.iformall.common.ErrorCode; | |||||
| import com.iformall.common.ResultData; | import com.iformall.common.ResultData; | ||||
| import com.iformall.domain.po.WxCUser; | |||||
| import com.iformall.domain.po.base.BaseEntity; | import com.iformall.domain.po.base.BaseEntity; | ||||
| import com.iformall.domain.po.WxScoreHistory; | import com.iformall.domain.po.WxScoreHistory; | ||||
| import com.iformall.service.WxScoreHistoryService; | import com.iformall.service.WxScoreHistoryService; | ||||
| @@ -27,9 +29,14 @@ public class WxScoreHistoryController extends BaseController { | |||||
| @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), | @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), | ||||
| @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) | @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) | ||||
| public ResultData list(Integer pageNum, Integer pageSize) { | public ResultData list(Integer pageNum, Integer pageSize) { | ||||
| WxCUser user = getUser(); | |||||
| if (!user.isBasicInfo()) { | |||||
| logger.error("暂未成为会员,请授权手机号"); | |||||
| return new ResultData(ErrorCode.USER_IS_NOT_MEMBER.getCode(), "暂未成为会员,请授权手机号"); | |||||
| } | |||||
| WxScoreHistory wxScoreHistory = new WxScoreHistory(); | WxScoreHistory wxScoreHistory = new WxScoreHistory(); | ||||
| wxScoreHistory.updateTenantInfo(getTenantInfo()); | wxScoreHistory.updateTenantInfo(getTenantInfo()); | ||||
| wxScoreHistory.setCUserId(getUserId()); | |||||
| wxScoreHistory.setCUserId(user.getUserId()); | |||||
| wxScoreHistory.setSortColumns(BaseEntity.SortField.CreateDate_DESC); | wxScoreHistory.setSortColumns(BaseEntity.SortField.CreateDate_DESC); | ||||
| final PageInfo<WxScoreHistory> page = wxScoreHistoryService.listAsPage(wxScoreHistory, pageNum, pageSize); | final PageInfo<WxScoreHistory> page = wxScoreHistoryService.listAsPage(wxScoreHistory, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| @@ -781,13 +781,15 @@ public class WxUserGrantController extends BaseController { | |||||
| userVo.setUpgradeScore(levelTarget-userVo.getScore()); | userVo.setUpgradeScore(levelTarget-userVo.getScore()); | ||||
| } | } | ||||
| WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoService.getById(user.getUserId()); | |||||
| if (wxCUserBasicInfo != null) { | |||||
| userVo.setName(wxCUserBasicInfo.getName()); | |||||
| userVo.setBirthdate(wxCUserBasicInfo.getBirthdate()); | |||||
| userVo.setSex(wxCUserBasicInfo.getSex()); | |||||
| userVo.setAddress(wxCUserBasicInfo.getAddress()); | |||||
| userVo.setStatus(wxCUserBasicInfo.getStatus()); | |||||
| if(user.isBasicInfo()){ | |||||
| WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoService.getById(user.getUserId()); | |||||
| if (wxCUserBasicInfo != null) { | |||||
| userVo.setName(wxCUserBasicInfo.getName()); | |||||
| userVo.setBirthdate(wxCUserBasicInfo.getBirthdate()); | |||||
| userVo.setSex(wxCUserBasicInfo.getSex()); | |||||
| userVo.setAddress(wxCUserBasicInfo.getAddress()); | |||||
| userVo.setStatus(wxCUserBasicInfo.getStatus()); | |||||
| } | |||||
| } | } | ||||
| return new ResultData(userVo); | return new ResultData(userVo); | ||||
| @@ -797,8 +799,11 @@ public class WxUserGrantController extends BaseController { | |||||
| @GetMapping("/carCount") | @GetMapping("/carCount") | ||||
| public ResultData carCount() { | public ResultData carCount() { | ||||
| WxCUser user = getUser(); | WxCUser user = getUser(); | ||||
| if (!user.isBasicInfo()) { | |||||
| logger.error("暂未成为会员,请授权手机号"); | |||||
| return new ResultData(ErrorCode.USER_IS_NOT_MEMBER.getCode(), "暂未成为会员,请授权手机号"); | |||||
| } | |||||
| WxCUserCar userCar = new WxCUserCar(); | WxCUserCar userCar = new WxCUserCar(); | ||||
| userCar.updateTenantInfo(user); | |||||
| userCar.setCUserId(user.getUserId()); | userCar.setCUserId(user.getUserId()); | ||||
| Integer count = wxCUserCarService.countUserCar(userCar); | Integer count = wxCUserCarService.countUserCar(userCar); | ||||
| if (count > 0) { | if (count > 0) { | ||||
| @@ -819,8 +824,12 @@ public class WxUserGrantController extends BaseController { | |||||
| @ApiOperation("获取当前用户车牌列表") | @ApiOperation("获取当前用户车牌列表") | ||||
| @GetMapping("/carList") | @GetMapping("/carList") | ||||
| public ResultData getCarList() { | public ResultData getCarList() { | ||||
| WxCUser user = getUser(); | |||||
| if (!user.isBasicInfo()) { | |||||
| logger.error("暂未成为会员,请授权手机号"); | |||||
| return new ResultData(ErrorCode.USER_IS_NOT_MEMBER.getCode(), "暂未成为会员,请授权手机号"); | |||||
| } | |||||
| WxCUserCar userCar = new WxCUserCar(); | WxCUserCar userCar = new WxCUserCar(); | ||||
| userCar.updateTenantInfo(getTenantInfo()); | |||||
| userCar.setCUserId(getUser().getUserId()); | userCar.setCUserId(getUser().getUserId()); | ||||
| List<WxCUserCar> list = wxCUserCarService.getList(userCar); | List<WxCUserCar> list = wxCUserCarService.getList(userCar); | ||||
| return new ResultData(Result.SUCCESS, "获取查询成功", list); | return new ResultData(Result.SUCCESS, "获取查询成功", list); | ||||
| @@ -873,10 +882,13 @@ public class WxUserGrantController extends BaseController { | |||||
| @PostMapping("/updateUserInfo") | @PostMapping("/updateUserInfo") | ||||
| @ApiOperation(value = "用户更新信息", notes = "") | @ApiOperation(value = "用户更新信息", notes = "") | ||||
| public ResultData updateUserInfo(@RequestBody WxCUserBasicInfo wxCUserBasicInfo) { | public ResultData updateUserInfo(@RequestBody WxCUserBasicInfo wxCUserBasicInfo) { | ||||
| WxCUser user = getUser(); | |||||
| if (!user.isBasicInfo()) { | |||||
| logger.error("暂未成为会员,请授权手机号"); | |||||
| return new ResultData(ErrorCode.USER_IS_NOT_MEMBER.getCode(), "暂未成为会员,请授权手机号"); | |||||
| } | |||||
| if (wxCUserBasicInfo == null) | if (wxCUserBasicInfo == null) | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); | ||||
| if (wxCUserBasicInfoService.getById(getUser().getUserId()) == null) | |||||
| return new ResultData(ErrorCode.USER_IS_NOT_MEMBER); | |||||
| TenantEntity tenantEntity = getTenantInfo(); | TenantEntity tenantEntity = getTenantInfo(); | ||||
| @@ -917,6 +929,10 @@ public class WxUserGrantController extends BaseController { | |||||
| @ApiOperation(value = "获取用户折扣率", notes = "") | @ApiOperation(value = "获取用户折扣率", notes = "") | ||||
| public ResultData getDiscountInfo() { | public ResultData getDiscountInfo() { | ||||
| WxCUser user = getUser(); | WxCUser user = getUser(); | ||||
| if (!user.isBasicInfo()) { | |||||
| logger.error("暂未成为会员,请授权手机号"); | |||||
| return new ResultData(ErrorCode.USER_IS_NOT_MEMBER.getCode(), "暂未成为会员,请授权手机号"); | |||||
| } | |||||
| List<WxLevelConfig> levelList = wxLevelConfigService.getByTenantId(user.getTenantId()); | List<WxLevelConfig> levelList = wxLevelConfigService.getByTenantId(user.getTenantId()); | ||||
| @@ -203,7 +203,7 @@ public interface WxCouponOrderService { | |||||
| /** | /** | ||||
| * B端-收银台-支持优惠券 | * B端-收银台-支持优惠券 | ||||
| */ | */ | ||||
| JSONArray queryMicroPayCouponOrder(WxMerchantBUser user, WxCUser cUser, Integer price); | |||||
| JSONArray queryMicroPayCouponOrder(WxMerchantBUser user, WxCUserBasicInfo cUser, Integer price); | |||||
| WxPayOrder microPayPreVerify(WxOrder microOrder, WxCouponOrder couponOrder, WxMerchantBUser bUser, Integer price); | WxPayOrder microPayPreVerify(WxOrder microOrder, WxCouponOrder couponOrder, WxMerchantBUser bUser, Integer price); | ||||
| @@ -37,7 +37,6 @@ import org.springframework.data.redis.core.RedisTemplate; | |||||
| import org.springframework.stereotype.Service; | import org.springframework.stereotype.Service; | ||||
| import org.springframework.transaction.annotation.Propagation; | import org.springframework.transaction.annotation.Propagation; | ||||
| import org.springframework.transaction.annotation.Transactional; | import org.springframework.transaction.annotation.Transactional; | ||||
| import org.springframework.util.CollectionUtils; | |||||
| import javax.servlet.http.HttpServletRequest; | import javax.servlet.http.HttpServletRequest; | ||||
| import javax.servlet.http.HttpServletResponse; | import javax.servlet.http.HttpServletResponse; | ||||
| @@ -68,6 +67,9 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { | |||||
| @Autowired | @Autowired | ||||
| WxCUserMapper wxCUserMapper; | WxCUserMapper wxCUserMapper; | ||||
| @Autowired | |||||
| WxCUserBasicInfoMapper wxCUserBasicInfoMapper; | |||||
| @Autowired | @Autowired | ||||
| WxOrderService wxOrderService; | WxOrderService wxOrderService; | ||||
| @@ -425,7 +427,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { | |||||
| } | } | ||||
| } | } | ||||
| private void doAfterVerify(WxCouponOrder couponOrder, WxCoupon wxCoupon, WxCUser cuUser) { | |||||
| private void doAfterVerify(WxCouponOrder couponOrder, WxCoupon wxCoupon, WxCUserBasicInfo cuUser) { | |||||
| // 成长值 | // 成长值 | ||||
| try { | try { | ||||
| WxOrder order = wxOrderMapper.selectById(couponOrder.getOrderId()); | WxOrder order = wxOrderMapper.selectById(couponOrder.getOrderId()); | ||||
| @@ -732,8 +734,16 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { | |||||
| logger.error("找不到商户信息"); | logger.error("找不到商户信息"); | ||||
| throw new MallinkException(ErrorCode.MERCHANT_INFO_NOT_FOUND); | throw new MallinkException(ErrorCode.MERCHANT_INFO_NOT_FOUND); | ||||
| } | } | ||||
| // 4. get user info | // 4. get user info | ||||
| WxCUser user = wxCUserMapper.selectById(order.getCUserId()); | |||||
| WxCUser user = null; | |||||
| WxCUser userQ = new WxCUser(); | |||||
| userQ.setTenantId(bUser.getTenantId()); | |||||
| userQ.setUserId(couponOrder.getCUserId()); | |||||
| List<WxCUser> list = wxCUserMapper.findList(userQ); | |||||
| if(list != null && list.size() > 0){ | |||||
| user = list.get(0); | |||||
| } | |||||
| if (user == null) { | if (user == null) { | ||||
| logger.error("找不到C端用户"); | logger.error("找不到C端用户"); | ||||
| throw new MallinkException(ErrorCode.USER_IS_EMPTY); | throw new MallinkException(ErrorCode.USER_IS_EMPTY); | ||||
| @@ -991,8 +1001,8 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { | |||||
| @Override | @Override | ||||
| public ResultData cardDetailCUserVo(Long ownerId, String couponOrderId) { | public ResultData cardDetailCUserVo(Long ownerId, String couponOrderId) { | ||||
| WxCUser wxCuser = wxCUserMapper.selectById(ownerId); | |||||
| if (wxCuser == null) { | |||||
| WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoMapper.selectById(ownerId); | |||||
| if (wxCUserBasicInfo == null) { | |||||
| logger.error("用户不存在:" + ownerId); | logger.error("用户不存在:" + ownerId); | ||||
| throw new MallinkException(ErrorCode.USER_IS_EMPTY); | throw new MallinkException(ErrorCode.USER_IS_EMPTY); | ||||
| } | } | ||||
| @@ -1021,8 +1031,9 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { | |||||
| } | } | ||||
| //转赠人是否存在 | //转赠人是否存在 | ||||
| Long cUserId = record.getCUserId(); | Long cUserId = record.getCUserId(); | ||||
| WxCUser wxCuser = wxCUserMapper.selectById(cUserId); | |||||
| if (wxCuser == null) { | |||||
| WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoMapper.selectById(cUserId); | |||||
| if (wxCUserBasicInfo == null) { | |||||
| logger.info("转赠人不存在:" + cUserId); | logger.info("转赠人不存在:" + cUserId); | ||||
| return new ResultData(ErrorCode.USER_IS_EMPTY.getCode(), "转赠人不存在"); | return new ResultData(ErrorCode.USER_IS_EMPTY.getCode(), "转赠人不存在"); | ||||
| } | } | ||||
| @@ -1074,8 +1085,8 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { | |||||
| } | } | ||||
| //转赠人是否存在 | //转赠人是否存在 | ||||
| Long cUserId = record.getCUserId(); | Long cUserId = record.getCUserId(); | ||||
| WxCUser wxCuser = wxCUserMapper.selectById(cUserId); | |||||
| if (wxCuser == null) { | |||||
| WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoMapper.selectById(cUserId); | |||||
| if (wxCUserBasicInfo == null) { | |||||
| logger.info("转赠人不存在:" + cUserId); | logger.info("转赠人不存在:" + cUserId); | ||||
| return new ResultData(ErrorCode.USER_IS_EMPTY.getCode(), "转赠人不存在"); | return new ResultData(ErrorCode.USER_IS_EMPTY.getCode(), "转赠人不存在"); | ||||
| } | } | ||||
| @@ -1121,7 +1132,7 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { | |||||
| } | } | ||||
| @Override | @Override | ||||
| public JSONArray queryMicroPayCouponOrder(WxMerchantBUser user, WxCUser cUser, Integer payPrice) { | |||||
| public JSONArray queryMicroPayCouponOrder(WxMerchantBUser user, WxCUserBasicInfo cUser, Integer payPrice) { | |||||
| // 1. 是否有核销未完成的券 | // 1. 是否有核销未完成的券 | ||||
| Map<String, Object> coQ = new HashMap<>(); | Map<String, Object> coQ = new HashMap<>(); | ||||
| @@ -1403,9 +1414,9 @@ public class WxCouponOrderServiceImpl implements WxCouponOrderService { | |||||
| int num = wxCouponOrderMapper.updateById(updateCouponOrder); | int num = wxCouponOrderMapper.updateById(updateCouponOrder); | ||||
| if (num == 1) { | if (num == 1) { | ||||
| WxCouponOrder couponOrder = wxCouponOrderMapper.selectById(couponOrderId); | WxCouponOrder couponOrder = wxCouponOrderMapper.selectById(couponOrderId); | ||||
| WxCUser cuUser = wxCUserMapper.selectById(couponOrder.getcUserId()); | |||||
| WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoMapper.selectById(couponOrder.getcUserId()); | |||||
| WxCoupon coupon = wxCouponMapper.selectById(couponOrder.getCouponId()); | WxCoupon coupon = wxCouponMapper.selectById(couponOrder.getCouponId()); | ||||
| doAfterVerify(couponOrder, coupon, cuUser); | |||||
| doAfterVerify(couponOrder, coupon, wxCUserBasicInfo); | |||||
| } | } | ||||
| return 0; | return 0; | ||||
| } | } | ||||