| @@ -19,6 +19,12 @@ ADD COLUMN `login_count` int(11) DEFAULT 0 COMMENT '登陆次数' AFTER `active | |||||
| update wx_c_user_basic_info wcubi set wcubi.login_count = (select wcu.login_count from wx_c_user wcu where wcu.id=wcubi.id); | update wx_c_user_basic_info wcubi set wcubi.login_count = (select wcu.login_count from wx_c_user wcu where wcu.id=wcubi.id); | ||||
| ALTER TABLE `wx_c_user_basic_info` | |||||
| ADD COLUMN `avatar_url` int(11) DEFAULT 0 COMMENT '头像地址' AFTER `nick_name`; | |||||
| update wx_c_user_basic_info wcubi set wcubi.avatar_url = (select wcu.avatar_url from wx_c_user wcu where wcu.id=wcubi.id); | |||||
| ALTER TABLE `wx_coupon_order` | ALTER TABLE `wx_coupon_order` | ||||
| ADD COLUMN `pay_vendor` SMALLINT(3) NOT NULL DEFAULT 1 COMMENT '订单渠道,EnumPayWay.class'; | ADD COLUMN `pay_vendor` SMALLINT(3) NOT NULL DEFAULT 1 COMMENT '订单渠道,EnumPayWay.class'; | ||||
| @@ -93,6 +93,15 @@ public class BaseController { | |||||
| return cUserId; | return cUserId; | ||||
| } | } | ||||
| public Long getMemberId() { | |||||
| HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); | |||||
| Long memberId = (Long) request.getAttribute(Constant.LOGIN_MEMBER_KEY); | |||||
| if(memberId == null){ | |||||
| throw new MallinkException(ErrorCode.USER_IS_NOT_MEMBER); | |||||
| } | |||||
| return memberId; | |||||
| } | |||||
| /** | /** | ||||
| * 请尽量多用getTenantId, getUserId | * 请尽量多用getTenantId, getUserId | ||||
| */ | */ | ||||
| @@ -112,6 +121,18 @@ public class BaseController { | |||||
| return user; | return user; | ||||
| } | } | ||||
| /** | |||||
| * | |||||
| */ | |||||
| public WxCUserBasicInfo getMember() { | |||||
| Long memberId = getMemberId(); | |||||
| WxCUserBasicInfo member = wxCUserBasicInfoService.getById(memberId); | |||||
| if (member == null) { | |||||
| throw new MallinkException(ErrorCode.USER_IS_EMPTY); | |||||
| } | |||||
| return member; | |||||
| } | |||||
| public WxAppinfo getAppInfo(String appId) { | public WxAppinfo getAppInfo(String appId) { | ||||
| return wxAppinfoService.getByAppId(appId); | return wxAppinfoService.getByAppId(appId); | ||||
| } | } | ||||
| @@ -183,6 +204,7 @@ public class BaseController { | |||||
| } else if(byId != null){ | } else if(byId != null){ | ||||
| byId.setPhone(phone); | byId.setPhone(phone); | ||||
| byId.setNickName(user.getNickName()); | byId.setNickName(user.getNickName()); | ||||
| byId.setAvatarUrl(user.getAvatarUrl()); | |||||
| wxCUserBasicInfoService.update(byId); | wxCUserBasicInfoService.update(byId); | ||||
| }else{ | }else{ | ||||
| Date cur = new Date(); | Date cur = new Date(); | ||||
| @@ -191,6 +213,7 @@ public class BaseController { | |||||
| basicInfo.updateTenantInfo(tenantEntity); | basicInfo.updateTenantInfo(tenantEntity); | ||||
| basicInfo.setPhone(phone); | basicInfo.setPhone(phone); | ||||
| basicInfo.setNickName(user.getNickName()); | basicInfo.setNickName(user.getNickName()); | ||||
| basicInfo.setAvatarUrl(user.getAvatarUrl()); | |||||
| basicInfo.setSex(user.getGender()); | basicInfo.setSex(user.getGender()); | ||||
| basicInfo.setLoginCount(1); | basicInfo.setLoginCount(1); | ||||
| basicInfo.setActiveTime(cur); | basicInfo.setActiveTime(cur); | ||||
| @@ -38,25 +38,15 @@ public class WxActivityController extends BaseController { | |||||
| @GetMapping("/queryStatus") | @GetMapping("/queryStatus") | ||||
| @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(); | |||||
| 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, getMemberId())); | |||||
| } | } | ||||
| @ApiOperation("根据id查询接口") | @ApiOperation("根据id查询接口") | ||||
| @GetMapping("/findById") | @GetMapping("/findById") | ||||
| @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(); | |||||
| 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, getMemberId()); | |||||
| Map<String, Object> data = new HashMap<>(); | Map<String, Object> data = new HashMap<>(); | ||||
| data.put("activity", wxActivity); | data.put("activity", wxActivity); | ||||
| data.put("status", status); | data.put("status", status); | ||||
| @@ -5,6 +5,7 @@ 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.WxCUser; | ||||
| import com.iformall.domain.po.WxCUserBasicInfo; | |||||
| import com.iformall.domain.po.base.BaseEntity; | import com.iformall.domain.po.base.BaseEntity; | ||||
| import com.iformall.domain.po.WxActivity; | import com.iformall.domain.po.WxActivity; | ||||
| import com.iformall.domain.po.WxActivityJoin; | import com.iformall.domain.po.WxActivityJoin; | ||||
| @@ -42,14 +43,11 @@ public class WxActivityJoinController 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(@ModelAttribute WxActivityJoin wxActivityJoin, Integer pageNum, Integer pageSize) { | public ResultData list(@ModelAttribute WxActivityJoin wxActivityJoin, Integer pageNum, Integer pageSize) { | ||||
| WxCUser user = getUser(); | |||||
| 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()); | ||||
| wxActivityJoin.setUserId(user.getUserId()); | |||||
| wxActivityJoin.setUserId(getMemberId()); | |||||
| wxActivityJoin.setSortColumns(BaseEntity.SortField.CreateTime_DESC); | wxActivityJoin.setSortColumns(BaseEntity.SortField.CreateTime_DESC); | ||||
| final PageInfo<WxActivity> page = wxActivityJoinService.clistAsPage(wxActivityJoin, pageNum, pageSize); | final PageInfo<WxActivity> page = wxActivityJoinService.clistAsPage(wxActivityJoin, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| @@ -58,17 +56,13 @@ public class WxActivityJoinController extends BaseController { | |||||
| @ApiOperation("报名") | @ApiOperation("报名") | ||||
| @PostMapping("join") | @PostMapping("join") | ||||
| public ResultData join(@RequestBody WxActivityJoin wxActivityJoin) { | public ResultData join(@RequestBody WxActivityJoin wxActivityJoin) { | ||||
| WxCUser user = getUser(); | |||||
| 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不能为空"); | ||||
| } | } | ||||
| WxCUserBasicInfo member = getMember(); | |||||
| wxActivityJoin.updateTenantInfo(getTenantInfo()); | wxActivityJoin.updateTenantInfo(getTenantInfo()); | ||||
| wxActivityJoin.setUserId(user.getUserId()); | |||||
| wxActivityJoin.setNickName(user.getNickName()); | |||||
| wxActivityJoin.setUserId(member.getId()); | |||||
| wxActivityJoin.setNickName(member.getNickName()); | |||||
| if (StringUtils.isNotEmpty(wxActivityJoin.getAnswer())) { | if (StringUtils.isNotEmpty(wxActivityJoin.getAnswer())) { | ||||
| List<WxActivityJoinQuestionAnswer> wxActivityJoinQuestionAnswers = JSONArray.parseArray(wxActivityJoin.getAnswer(), WxActivityJoinQuestionAnswer.class); | List<WxActivityJoinQuestionAnswer> wxActivityJoinQuestionAnswers = JSONArray.parseArray(wxActivityJoin.getAnswer(), WxActivityJoinQuestionAnswer.class); | ||||
| List<WxActivityJoinQuestionAnswer> collect = wxActivityJoinQuestionAnswers.stream().filter(answer -> answer != null).collect(Collectors.toList()); | List<WxActivityJoinQuestionAnswer> collect = wxActivityJoinQuestionAnswers.stream().filter(answer -> answer != null).collect(Collectors.toList()); | ||||
| @@ -85,16 +79,11 @@ public class WxActivityJoinController extends BaseController { | |||||
| @ApiOperation("签到") | @ApiOperation("签到") | ||||
| @PostMapping("sign") | @PostMapping("sign") | ||||
| public ResultData sign(@RequestBody WxActivityJoin wxActivityJoin) { | public ResultData sign(@RequestBody WxActivityJoin wxActivityJoin) { | ||||
| WxCUser user = getUser(); | |||||
| 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不能为空"); | ||||
| } | } | ||||
| wxActivityJoin.updateTenantInfo(getTenantInfo()); | wxActivityJoin.updateTenantInfo(getTenantInfo()); | ||||
| wxActivityJoin.setUserId(user.getUserId()); | |||||
| wxActivityJoin.setUserId(getMemberId()); | |||||
| return wxActivityJoinService.sign(wxActivityJoin); | return wxActivityJoinService.sign(wxActivityJoin); | ||||
| } | } | ||||
| @@ -101,16 +101,11 @@ public class WxCarController extends BaseController { | |||||
| @ApiOperation(value = "初始化/etcp共同登录", notes = "{\"phone\":\"string\"}") | @ApiOperation(value = "初始化/etcp共同登录", notes = "{\"phone\":\"string\"}") | ||||
| @PostMapping("/init") | @PostMapping("/init") | ||||
| public ResultData init(@RequestBody Map<String, String> paramMap) { | public ResultData init(@RequestBody Map<String, String> paramMap) { | ||||
| WxCUser user = getUser(); | |||||
| 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()); | ||||
| // 2. get vendor params | // 2. get vendor params | ||||
| if (park.getVendorType().equals(EnumCarVendor.CAR_ETCP.getCode())) { | if (park.getVendorType().equals(EnumCarVendor.CAR_ETCP.getCode())) { | ||||
| return initForEtcp(paramMap, user.getUserId(), park); | |||||
| return initForEtcp(paramMap, getMemberId(), park); | |||||
| } else if (park.getVendorType().equals(EnumCarVendor.CAR_TJD.getCode()) || | } else if (park.getVendorType().equals(EnumCarVendor.CAR_TJD.getCode()) || | ||||
| park.getVendorType().equals(EnumCarVendor.CAR_DAHUA.getCode()) || | park.getVendorType().equals(EnumCarVendor.CAR_DAHUA.getCode()) || | ||||
| park.getVendorType().equals(EnumCarVendor.CAR_SHANGAN.getCode()) || | park.getVendorType().equals(EnumCarVendor.CAR_SHANGAN.getCode()) || | ||||
| @@ -261,21 +256,17 @@ public class WxCarController extends BaseController { | |||||
| @ApiOperation(value = "绑车牌", notes = "ETCP:={\"etcpToken\":\"string\",\"carNumber\":\"string\"}, TJD:={\"carNumber\":\"string\"}") | @ApiOperation(value = "绑车牌", notes = "ETCP:={\"etcpToken\":\"string\",\"carNumber\":\"string\"}, TJD:={\"carNumber\":\"string\"}") | ||||
| @PostMapping("/bindCar") | @PostMapping("/bindCar") | ||||
| public ResultData bindCar(@RequestBody Map<String, String> paramMap) { | public ResultData bindCar(@RequestBody Map<String, String> paramMap) { | ||||
| WxCUser user = getUser(); | |||||
| if (!user.isBasicInfo()) { | |||||
| logger.error("暂未成为会员,请授权手机号"); | |||||
| return new ResultData(ErrorCode.USER_IS_NOT_MEMBER.getCode(), "暂未成为会员,请授权手机号"); | |||||
| } | |||||
| WxCUserBasicInfo member = getMember(); | |||||
| // 1, get mall's park | // 1, get mall's park | ||||
| WxPark park = getCurrentPark(getTenantInfo()); | WxPark park = getCurrentPark(getTenantInfo()); | ||||
| // 2. get vendor params | // 2. get vendor params | ||||
| if (park.getVendorType() == EnumCarVendor.CAR_ETCP.getCode()) { | if (park.getVendorType() == EnumCarVendor.CAR_ETCP.getCode()) { | ||||
| return etcpBindCar(paramMap, park, user.getUserId()); | |||||
| return etcpBindCar(paramMap, park, member.getId()); | |||||
| } else if (park.getVendorType() == EnumCarVendor.CAE_CYF.getCode()){ | } else if (park.getVendorType() == EnumCarVendor.CAE_CYF.getCode()){ | ||||
| return cyfBindCar(paramMap,park,user); | |||||
| return cyfBindCar(paramMap,park,member); | |||||
| } else { | } else { | ||||
| // 内部操作 | // 内部操作 | ||||
| return bindCar(paramMap, park, user.getUserId()); | |||||
| return bindCar(paramMap, park, member.getId()); | |||||
| } | } | ||||
| } | } | ||||
| @@ -396,7 +387,7 @@ public class WxCarController extends BaseController { | |||||
| * @Author furunxin | * @Author furunxin | ||||
| * @Date 2020/7/8 下午10:23 | * @Date 2020/7/8 下午10:23 | ||||
| **/ | **/ | ||||
| private ResultData cyfBindCar(@RequestBody Map<String, String> paramMap, WxPark park,WxCUser wxCUser) { | |||||
| private ResultData cyfBindCar(@RequestBody Map<String, String> paramMap, WxPark park,WxCUserBasicInfo member) { | |||||
| String carNumber = paramMap.get("carNumber"); | String carNumber = paramMap.get("carNumber"); | ||||
| if (StringUtils.isBlank(carNumber)) { | if (StringUtils.isBlank(carNumber)) { | ||||
| logger.error("carNumber为空"); | logger.error("carNumber为空"); | ||||
| @@ -406,10 +397,10 @@ public class WxCarController extends BaseController { | |||||
| JSONObject objParams = JSON.parseObject(params); | JSONObject objParams = JSON.parseObject(params); | ||||
| String token = objParams.getString("token"); | String token = objParams.getString("token"); | ||||
| int feeGroupId = objParams.getIntValue("feeGroupId"); | int feeGroupId = objParams.getIntValue("feeGroupId"); | ||||
| String ret = cyf.registerCar(token,park.getNumber(),feeGroupId,park.getParkingId(),carNumber,wxCUser.getUserId(),wxCUser.getNickName()); | |||||
| String ret = cyf.registerCar(token,park.getNumber(),feeGroupId,park.getParkingId(),carNumber,member.getId(),member.getNickName()); | |||||
| JSONObject retObj = JSON.parseObject(ret); | JSONObject retObj = JSON.parseObject(ret); | ||||
| if (retObj.getIntValue("result") == 1){ | if (retObj.getIntValue("result") == 1){ | ||||
| addCarInfoToDB(carNumber, EnumCarVendor.getEnum(park.getVendorType()), park, wxCUser.getUserId()); | |||||
| addCarInfoToDB(carNumber, EnumCarVendor.getEnum(park.getVendorType()), park, member.getId()); | |||||
| }else { | }else { | ||||
| return new ResultData(ErrorCode.CAR_BIND_FAIL.getCode(), "绑车牌失败", retObj); | return new ResultData(ErrorCode.CAR_BIND_FAIL.getCode(), "绑车牌失败", retObj); | ||||
| } | } | ||||
| @@ -471,18 +462,12 @@ public class WxCarController extends BaseController { | |||||
| "TJD:={\"carNumber\":\"string\"}") | "TJD:={\"carNumber\":\"string\"}") | ||||
| @PostMapping("/unbindCar") | @PostMapping("/unbindCar") | ||||
| public ResultData unbindCar(@RequestBody Map<String, String> paramMap) { | public ResultData unbindCar(@RequestBody Map<String, String> paramMap) { | ||||
| WxCUser user = getUser(); | |||||
| 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()); | ||||
| if (park.getVendorType().equals(EnumCarVendor.CAR_ETCP.getCode())) { | if (park.getVendorType().equals(EnumCarVendor.CAR_ETCP.getCode())) { | ||||
| return etcpUnbindCar(paramMap, park, user.getUserId()); | |||||
| return etcpUnbindCar(paramMap, park, getMemberId()); | |||||
| } else { | } else { | ||||
| return unbindCar(paramMap, park, user.getUserId()); | |||||
| return unbindCar(paramMap, park, getMemberId()); | |||||
| } | } | ||||
| } | } | ||||
| @@ -798,11 +783,6 @@ 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(); | |||||
| 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()); | ||||
| String carNumber = paramMap.get("carNumber"); | String carNumber = paramMap.get("carNumber"); | ||||
| @@ -824,7 +804,7 @@ public class WxCarController extends BaseController { | |||||
| WxCouponOrderCarCVo userCar = null; | WxCouponOrderCarCVo userCar = null; | ||||
| WxCouponOrder userCarQ = new WxCouponOrder(); | WxCouponOrder userCarQ = new WxCouponOrder(); | ||||
| userCarQ.updateTenantInfo(park); | userCarQ.updateTenantInfo(park); | ||||
| userCarQ.setCUserId(user.getUserId()); | |||||
| userCarQ.setCUserId(getMemberId()); | |||||
| userCarQ.setId(couponOrderId); | userCarQ.setId(couponOrderId); | ||||
| userCarQ.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USE_WAIT.getCode()); | userCarQ.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USE_WAIT.getCode()); | ||||
| List<WxCouponOrderCarCVo> list = wxCouponOrderService.carListCUserVo(userCarQ); | List<WxCouponOrderCarCVo> list = wxCouponOrderService.carListCUserVo(userCarQ); | ||||
| @@ -997,17 +977,12 @@ public class WxCarController 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 WxCouponOrder wxCouponOrder, Integer pageNum, Integer pageSize) { | public ResultData list(@ModelAttribute WxCouponOrder wxCouponOrder, Integer pageNum, Integer pageSize) { | ||||
| WxCUser user = getUser(); | |||||
| 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); | ||||
| } | } | ||||
| if (wxCouponOrder == null) wxCouponOrder = new WxCouponOrderCarCVo(); | if (wxCouponOrder == null) wxCouponOrder = new WxCouponOrderCarCVo(); | ||||
| wxCouponOrder.updateTenantInfo(getTenantInfo()); | wxCouponOrder.updateTenantInfo(getTenantInfo()); | ||||
| wxCouponOrder.setCUserId(user.getUserId()); | |||||
| wxCouponOrder.setCUserId(getMemberId()); | |||||
| if (wxCouponOrder.getCouponOrderStatus() == null) | if (wxCouponOrder.getCouponOrderStatus() == null) | ||||
| wxCouponOrder.setSortColumns(BaseEntity.SortField.CreateDate_DESC); | wxCouponOrder.setSortColumns(BaseEntity.SortField.CreateDate_DESC); | ||||
| else if (wxCouponOrder.getCouponOrderStatus() == EnumCouponOrderStatus.COUPON_ORDER_USE_WAIT.getCode()) | else if (wxCouponOrder.getCouponOrderStatus() == EnumCouponOrderStatus.COUPON_ORDER_USE_WAIT.getCode()) | ||||
| @@ -77,15 +77,10 @@ public class WxCardPayController extends BaseController { | |||||
| @ApiOperation(value = "微信C端扫B端储值卡支付订单", notes = "params:{\"cardId\":\"String\",\"merchantId\":\"String\",\"totalFee\":\"String(元)\"}") | @ApiOperation(value = "微信C端扫B端储值卡支付订单", notes = "params:{\"cardId\":\"String\",\"merchantId\":\"String\",\"totalFee\":\"String(元)\"}") | ||||
| @PostMapping("order_create") | @PostMapping("order_create") | ||||
| public ResultData saveCardPayOrder(@RequestBody Map<String, String> paramMap, HttpServletRequest request) { | public ResultData saveCardPayOrder(@RequestBody Map<String, String> paramMap, HttpServletRequest request) { | ||||
| WxCUser user = getUser(); | |||||
| if (!user.isBasicInfo()) { | |||||
| logger.error("暂未成为会员,请授权手机号"); | |||||
| return new ResultData(ErrorCode.USER_IS_NOT_MEMBER.getCode(), "暂未成为会员,请授权手机号"); | |||||
| } | |||||
| String cardIdStr = paramMap.get("cardId"); | String cardIdStr = paramMap.get("cardId"); | ||||
| String merchantStr = paramMap.get("merchantId"); | String merchantStr = paramMap.get("merchantId"); | ||||
| String totalFeeStr = paramMap.get("totalFee"); | String totalFeeStr = paramMap.get("totalFee"); | ||||
| return saveCardPayOrder(user.getUserId(),cardIdStr,merchantStr,totalFeeStr,EnumPayWay.PAY_WAY_WECHAT); | |||||
| return saveCardPayOrder(getMemberId(),cardIdStr,merchantStr,totalFeeStr,EnumPayWay.PAY_WAY_WECHAT); | |||||
| } | } | ||||
| private ResultData saveCardPayOrder(Long cUserId,String cardIdStr,String merchantStr,String totalFeeStr,EnumPayWay payWay) { | private ResultData saveCardPayOrder(Long cUserId,String cardIdStr,String merchantStr,String totalFeeStr,EnumPayWay payWay) { | ||||
| @@ -199,12 +194,7 @@ public class WxCardPayController extends BaseController { | |||||
| public ResultData cardSpendList(@ModelAttribute WxCardSpendVo wxCardSpend, Integer pageNum, Integer pageSize) { | public ResultData cardSpendList(@ModelAttribute WxCardSpendVo wxCardSpend, Integer pageNum, Integer pageSize) { | ||||
| String ipStr = getIpAddr(); | String ipStr = getIpAddr(); | ||||
| logger.info("list: " + ipStr + " :" + wxCardSpend.toString()); | logger.info("list: " + ipStr + " :" + wxCardSpend.toString()); | ||||
| WxCUser user = getUser(); | |||||
| if (!user.isBasicInfo()) { | |||||
| logger.error("暂未成为会员,请授权手机号"); | |||||
| return new ResultData(ErrorCode.USER_IS_NOT_MEMBER.getCode(), "暂未成为会员,请授权手机号"); | |||||
| } | |||||
| return cardSpendList(wxCardSpend,user.getUserId(), pageNum, pageSize); | |||||
| return cardSpendList(wxCardSpend,getMemberId(), pageNum, pageSize); | |||||
| } | } | ||||
| private ResultData cardSpendList(WxCardSpendVo wxCardSpend,Long cUserId,Integer pageNum, Integer pageSize) { | private ResultData cardSpendList(WxCardSpendVo wxCardSpend,Long cUserId,Integer pageNum, Integer pageSize) { | ||||
| @@ -220,12 +210,7 @@ public class WxCardPayController extends BaseController { | |||||
| public ResultData sumCardSpendList(@ModelAttribute WxCardSpendVo wxCardSpend) { | public ResultData sumCardSpendList(@ModelAttribute WxCardSpendVo wxCardSpend) { | ||||
| String ipStr = getIpAddr(); | String ipStr = getIpAddr(); | ||||
| logger.info("sumCardSpendList: " + ipStr + " :" + wxCardSpend.toString()); | logger.info("sumCardSpendList: " + ipStr + " :" + wxCardSpend.toString()); | ||||
| WxCUser user = getUser(); | |||||
| if (!user.isBasicInfo()) { | |||||
| logger.error("暂未成为会员,请授权手机号"); | |||||
| return new ResultData(ErrorCode.USER_IS_NOT_MEMBER.getCode(), "暂未成为会员,请授权手机号"); | |||||
| } | |||||
| return sumCardSpendList(wxCardSpend, user.getUserId()); | |||||
| return sumCardSpendList(wxCardSpend, getMemberId()); | |||||
| } | } | ||||
| private ResultData sumCardSpendList(WxCardSpendVo wxCardSpend,Long cUserId) { | private ResultData sumCardSpendList(WxCardSpendVo wxCardSpend,Long cUserId) { | ||||
| @@ -5,6 +5,7 @@ import com.iformall.annotation.RedisCache; | |||||
| 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.WxCUser; | ||||
| import com.iformall.domain.po.WxCUserBasicInfo; | |||||
| import com.iformall.domain.po.WxCoupon; | import com.iformall.domain.po.WxCoupon; | ||||
| import com.iformall.domain.po.base.BaseEntity; | import com.iformall.domain.po.base.BaseEntity; | ||||
| import com.iformall.domain.po.WxCouponOrder; | import com.iformall.domain.po.WxCouponOrder; | ||||
| @@ -65,16 +66,11 @@ public class WxCouponOrderController 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 WxCouponOrder wxCouponOrder, Integer pageNum, Integer pageSize) { | public ResultData list(@ModelAttribute WxCouponOrder wxCouponOrder, Integer pageNum, Integer pageSize) { | ||||
| WxCUser user = getUser(); | |||||
| 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); | ||||
| } | } | ||||
| if (wxCouponOrder == null) wxCouponOrder = new WxCouponOrderCVo(); | if (wxCouponOrder == null) wxCouponOrder = new WxCouponOrderCVo(); | ||||
| wxCouponOrder.setCUserId(user.getUserId()); | |||||
| wxCouponOrder.setCUserId(getMemberId()); | |||||
| if (wxCouponOrder.getCouponOrderStatus() == null) | if (wxCouponOrder.getCouponOrderStatus() == null) | ||||
| wxCouponOrder.setSortColumns(BaseEntity.SortField.CreateDate_DESC, BaseEntity.SortField.Id_DESC); | wxCouponOrder.setSortColumns(BaseEntity.SortField.CreateDate_DESC, BaseEntity.SortField.Id_DESC); | ||||
| else if (wxCouponOrder.getCouponOrderStatus() == EnumCouponOrderStatus.COUPON_ORDER_USE_WAIT.getCode()) | else if (wxCouponOrder.getCouponOrderStatus() == EnumCouponOrderStatus.COUPON_ORDER_USE_WAIT.getCode()) | ||||
| @@ -107,11 +103,6 @@ public class WxCouponOrderController extends BaseController { | |||||
| @ApiImplicitParam(name = "couponOrderId", value = "券ID", dataType = "string", paramType = "query", required = true) | @ApiImplicitParam(name = "couponOrderId", value = "券ID", dataType = "string", paramType = "query", required = true) | ||||
| }) | }) | ||||
| public ResultData detail(String couponOrderId) { | public ResultData detail(String couponOrderId) { | ||||
| WxCUser user = getUser(); | |||||
| 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); | ||||
| @@ -121,7 +112,7 @@ public class WxCouponOrderController extends BaseController { | |||||
| if (wxCouponOrderCVo == null) { | if (wxCouponOrderCVo == null) { | ||||
| return new ResultData(ErrorCode.COUPON_ORDER_IS_NULL); | return new ResultData(ErrorCode.COUPON_ORDER_IS_NULL); | ||||
| } | } | ||||
| if (!wxCouponOrderCVo.getCUserId().equals(user.getUserId())) { | |||||
| if (!wxCouponOrderCVo.getCUserId().equals(getMemberId())) { | |||||
| return new ResultData(ErrorCode.COUPON_ORDER_IS_NULL); | return new ResultData(ErrorCode.COUPON_ORDER_IS_NULL); | ||||
| } | } | ||||
| WxCouponCVo wxCouponCVo = null; | WxCouponCVo wxCouponCVo = null; | ||||
| @@ -246,11 +237,6 @@ public class WxCouponOrderController extends BaseController { | |||||
| @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true), | @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true), | ||||
| }) | }) | ||||
| public ResultData cardList(@ModelAttribute WxCardCVo cardCVo, Integer pageNum, Integer pageSize) { | public ResultData cardList(@ModelAttribute WxCardCVo cardCVo, Integer pageNum, Integer pageSize) { | ||||
| WxCUser user = getUser(); | |||||
| 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); | ||||
| @@ -259,7 +245,7 @@ public class WxCouponOrderController extends BaseController { | |||||
| cardCVo = new WxCardCVo(); | cardCVo = new WxCardCVo(); | ||||
| } | } | ||||
| cardCVo.updateTenantInfo(getTenantInfo()); | cardCVo.updateTenantInfo(getTenantInfo()); | ||||
| cardCVo.setOwnerId(user.getUserId()); | |||||
| cardCVo.setOwnerId(getMemberId()); | |||||
| if(StringUtils.isNotBlank(cardCVo.getStatusStr())) { | if(StringUtils.isNotBlank(cardCVo.getStatusStr())) { | ||||
| String [] statusAttr = cardCVo.getStatusStr().split(","); | String [] statusAttr = cardCVo.getStatusStr().split(","); | ||||
| List<Integer> tmpList = new ArrayList<Integer>(); | List<Integer> tmpList = new ArrayList<Integer>(); | ||||
| @@ -286,16 +272,11 @@ public class WxCouponOrderController extends BaseController { | |||||
| @ApiImplicitParam(name = "couponOrderId", value = "券ID", dataType = "string", paramType = "query", required = true) | @ApiImplicitParam(name = "couponOrderId", value = "券ID", dataType = "string", paramType = "query", required = true) | ||||
| }) | }) | ||||
| public ResultData cardDetail(String couponOrderId) { | public ResultData cardDetail(String couponOrderId) { | ||||
| WxCUser user = getUser(); | |||||
| 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); | ||||
| } | } | ||||
| return wxCouponOrderService.cardDetailCUserVo(user.getUserId(), couponOrderId); | |||||
| return wxCouponOrderService.cardDetailCUserVo(getMemberId(), couponOrderId); | |||||
| } | } | ||||
| @ApiOperation(value = "卡转赠领取") | @ApiOperation(value = "卡转赠领取") | ||||
| @@ -305,11 +286,6 @@ public class WxCouponOrderController extends BaseController { | |||||
| @ApiImplicitParam(name = "cUserId", value = "转赠者", dataType = "Long", paramType = "query", required = true), | @ApiImplicitParam(name = "cUserId", value = "转赠者", dataType = "Long", paramType = "query", required = true), | ||||
| }) | }) | ||||
| public ResultData cardAccept(@RequestBody WxCouponOrder wxCouponOrder) { | public ResultData cardAccept(@RequestBody WxCouponOrder wxCouponOrder) { | ||||
| WxCUser user = getUser(); | |||||
| 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(); | ||||
| if (id == null) { | if (id == null) { | ||||
| @@ -321,7 +297,7 @@ public class WxCouponOrderController extends BaseController { | |||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "cUserId不能为空"); | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "cUserId不能为空"); | ||||
| } | } | ||||
| //当前领取人 | //当前领取人 | ||||
| wxCouponOrder.setOwnerId(user.getUserId()); | |||||
| wxCouponOrder.setOwnerId(getMemberId()); | |||||
| //转赠者与当前领取人是否为同一个 | //转赠者与当前领取人是否为同一个 | ||||
| if (cUserId.equals(wxCouponOrder.getOwnerId())) { | if (cUserId.equals(wxCouponOrder.getOwnerId())) { | ||||
| logger.info("转赠人与卡所有者相同"); | logger.info("转赠人与卡所有者相同"); | ||||
| @@ -339,11 +315,6 @@ public class WxCouponOrderController extends BaseController { | |||||
| @ApiImplicitParam(name = "cUserId", value = "转赠者", dataType = "Long", paramType = "query", required = true), | @ApiImplicitParam(name = "cUserId", value = "转赠者", dataType = "Long", paramType = "query", required = true), | ||||
| }) | }) | ||||
| public ResultData queryCardStatus(@ModelAttribute WxCouponOrder wxCouponOrder) { | public ResultData queryCardStatus(@ModelAttribute WxCouponOrder wxCouponOrder) { | ||||
| WxCUser user = getUser(); | |||||
| 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(); | ||||
| if (id == null) { | if (id == null) { | ||||
| @@ -359,7 +330,7 @@ public class WxCouponOrderController extends BaseController { | |||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "updateDate不能为空"); | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "updateDate不能为空"); | ||||
| } | } | ||||
| //当前领取人 | //当前领取人 | ||||
| wxCouponOrder.setOwnerId(user.getUserId()); | |||||
| wxCouponOrder.setOwnerId(getMemberId()); | |||||
| return wxCouponOrderService.queryCardStatus(wxCouponOrder); | return wxCouponOrderService.queryCardStatus(wxCouponOrder); | ||||
| } | } | ||||
| @@ -367,8 +338,8 @@ public class WxCouponOrderController extends BaseController { | |||||
| @GetMapping("checkH5CouponOrder") | @GetMapping("checkH5CouponOrder") | ||||
| public ResultData checkH5CouponOrder() { | public ResultData checkH5CouponOrder() { | ||||
| TenantEntity tenantEntity = getTenantInfo(); | TenantEntity tenantEntity = getTenantInfo(); | ||||
| WxCUser user = getUser(); | |||||
| memCouponFromDspService.couponOrderFromDsp(tenantEntity, user.getPhone()); | |||||
| WxCUserBasicInfo member = getMember(); | |||||
| memCouponFromDspService.couponOrderFromDsp(tenantEntity, member.getPhone()); | |||||
| return new ResultData(); | return new ResultData(); | ||||
| } | } | ||||
| @@ -42,19 +42,10 @@ public class WxCouponPasswordController extends BaseController { | |||||
| logger.info("getCouponOrderByPassword: " + getIpAddr() + params.toString()); | logger.info("getCouponOrderByPassword: " + getIpAddr() + params.toString()); | ||||
| String password = params.get("password"); | String password = params.get("password"); | ||||
| String formId = params.get("formId"); | String formId = params.get("formId"); | ||||
| WxCUser cuUser = getUser(); | |||||
| if (null == cuUser ) { | |||||
| return new ResultData(ErrorCode.USER_IS_EMPTY.getCode(), "用户信息失效,请重新登陆"); | |||||
| } | |||||
| if (!cuUser.isBasicInfo()) { | |||||
| logger.error("暂未成为会员,请授权手机号"); | |||||
| return new ResultData(ErrorCode.USER_IS_NOT_MEMBER.getCode(), "暂未成为会员,请授权手机号"); | |||||
| } | |||||
| return getCouponOrderByPassword(password, formId, cuUser.getUserId(),EnumPayWay.PAY_WAY_NOT_UNPAY_PASSWD); | |||||
| return getCouponOrderByPassword(password, formId, getMemberId(),EnumPayWay.PAY_WAY_NOT_UNPAY_PASSWD); | |||||
| } | } | ||||
| private ResultData getCouponOrderByPassword(String password,String formId,Long cUserId,EnumPayWay payWay) { | |||||
| private ResultData getCouponOrderByPassword(String password,String formId,Long memberId,EnumPayWay payWay) { | |||||
| if (StringUtils.isBlank(password) || password.equalsIgnoreCase(Constant.UNDEFINED)) { | if (StringUtils.isBlank(password) || password.equalsIgnoreCase(Constant.UNDEFINED)) { | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "password不能为空"); | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "password不能为空"); | ||||
| @@ -76,10 +67,10 @@ public class WxCouponPasswordController extends BaseController { | |||||
| } | } | ||||
| WxCUserBasicInfo user = userService.getById(cUserId); | |||||
| if(user == null) { | |||||
| logger.error("会员用户未找到: " + cUserId); | |||||
| throw new MallinkException(ErrorCode.USER_IS_EMPTY.getCode(), "会员用户未找到" + cUserId); | |||||
| WxCUserBasicInfo member = userService.getById(memberId); | |||||
| if(member == null) { | |||||
| logger.error("会员用户未找到: " + memberId); | |||||
| throw new MallinkException(ErrorCode.USER_IS_EMPTY.getCode(), "会员用户未找到" + memberId); | |||||
| } | } | ||||
| WxCoupon coupon = couponService.getById(couponPassword.getCouponId()); | WxCoupon coupon = couponService.getById(couponPassword.getCouponId()); | ||||
| @@ -98,7 +89,7 @@ public class WxCouponPasswordController extends BaseController { | |||||
| // 3. 领取free coupon | // 3. 领取free coupon | ||||
| try { | try { | ||||
| WxOrder order = orderService.saveFreeOrderForCoupon(user, coupon, null, formId, couponPassword.getId(),payWay); | |||||
| WxOrder order = orderService.saveFreeOrderForCoupon(member, coupon, null, formId, couponPassword.getId(),payWay); | |||||
| } catch (MallinkException e) { | } catch (MallinkException e) { | ||||
| setCouponPasswordStatus(couponPassword, EnumCouponPasswordStatus.getEnum(pwdStatus)); | setCouponPasswordStatus(couponPassword, EnumCouponPasswordStatus.getEnum(pwdStatus)); | ||||
| logger.error(e.getMessage()); | logger.error(e.getMessage()); | ||||
| @@ -35,13 +35,10 @@ public class WxCreditHistoryController 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 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(); | |||||
| WxCUser user = getUser(); | |||||
| if (!user.isBasicInfo()) { | |||||
| logger.error("暂未成为会员,请授权手机号"); | |||||
| return new ResultData(ErrorCode.USER_IS_NOT_MEMBER.getCode(), "暂未成为会员,请授权手机号"); | |||||
| if (null == wxCreditHistory){ | |||||
| wxCreditHistory = new WxCreditHistory(); | |||||
| } | } | ||||
| wxCreditHistory.setCUserId(user.getUserId()); | |||||
| wxCreditHistory.setCUserId(getMemberId()); | |||||
| 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); | ||||
| @@ -69,22 +69,14 @@ public class WxGameController extends BaseController { | |||||
| @ApiImplicitParam(name = "gameId", value = "游戏ID", dataType = "String", paramType = "query", required = true), | @ApiImplicitParam(name = "gameId", value = "游戏ID", dataType = "String", paramType = "query", required = true), | ||||
| @ApiImplicitParam(name = "orderId", value = "券订单ID", dataType = "String", paramType = "query", required = true)}) | @ApiImplicitParam(name = "orderId", value = "券订单ID", dataType = "String", paramType = "query", required = true)}) | ||||
| public ResultData addActionLog(@RequestBody Map<String,String> paramMap) { | public ResultData addActionLog(@RequestBody Map<String,String> paramMap) { | ||||
| Long gameIdL = 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")); | |||||
| orderIdL = Long.valueOf(paramMap.get("orderId")); | |||||
| Long gameIdL = Long.valueOf(paramMap.get("gameId")); | |||||
| Long orderIdL = Long.valueOf(paramMap.get("orderId")); | |||||
| return wxGameService.addActionLog(getMemberId(), gameIdL, orderIdL); | |||||
| } catch (Exception e){ | } catch (Exception e){ | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); | return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); | ||||
| } | } | ||||
| return wxGameService.addActionLog(user.getUserId(), gameIdL, orderIdL); | |||||
| } | } | ||||
| @ApiOperation("添加游戏参与记录") | @ApiOperation("添加游戏参与记录") | ||||
| @@ -92,18 +84,12 @@ 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; | |||||
| try { | try { | ||||
| gameIdL = Long.valueOf(gameId); | |||||
| Long gameIdL = Long.valueOf(gameId); | |||||
| return wxGameService.getCount(gameIdL,getMemberId()); | |||||
| } catch (Exception e){ | } catch (Exception e){ | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); | return new ResultData(ErrorCode.SYS_PARAMETER_ERROR); | ||||
| } | } | ||||
| return wxGameService.getCount(gameIdL,user.getUserId()); | |||||
| } | } | ||||
| } | } | ||||
| @@ -65,12 +65,7 @@ public class WxOrderController extends BaseController { | |||||
| @ApiOperation(value = "下订单", notes = "{\"couponChannelId\":\"String\",\"couponId\":\"String\",\"press\":\"String\",\"orderGroupId\":\"String\",\"formId\":\"String\"}") | @ApiOperation(value = "下订单", notes = "{\"couponChannelId\":\"String\",\"couponId\":\"String\",\"press\":\"String\",\"orderGroupId\":\"String\",\"formId\":\"String\"}") | ||||
| @PostMapping("save") | @PostMapping("save") | ||||
| public ResultData saveOrder(@RequestBody OrderSaveDto orderSaveDto) { | public ResultData saveOrder(@RequestBody OrderSaveDto orderSaveDto) { | ||||
| WxCUser user = getUser(); | |||||
| if (!user.isBasicInfo()) { | |||||
| logger.error("暂未成为会员,请授权手机号"); | |||||
| return new ResultData(ErrorCode.USER_IS_NOT_MEMBER.getCode(), "暂未成为会员,请授权手机号"); | |||||
| } | |||||
| return saveOrder(orderSaveDto,user.getUserId(),EnumPayWay.PAY_WAY_WECHAT); | |||||
| return saveOrder(orderSaveDto,getMemberId(),EnumPayWay.PAY_WAY_WECHAT); | |||||
| } | } | ||||
| private ResultData saveOrder(OrderSaveDto orderSaveDto,Long cUserId,EnumPayWay payWay) { | private ResultData saveOrder(OrderSaveDto orderSaveDto,Long cUserId,EnumPayWay payWay) { | ||||
| @@ -275,14 +270,11 @@ public class WxOrderController 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 WxOrder wxOrder, Integer pageNum, Integer pageSize) { | public ResultData list(@ModelAttribute WxOrder wxOrder, Integer pageNum, Integer pageSize) { | ||||
| WxCUser user = getUser(); | |||||
| if (!user.isBasicInfo()) { | |||||
| logger.error("暂未成为会员,请授权手机号"); | |||||
| return new ResultData(ErrorCode.USER_IS_NOT_MEMBER.getCode(), "暂未成为会员,请授权手机号"); | |||||
| } | |||||
| // c端用户应该只能看到自己的订单 | // c端用户应该只能看到自己的订单 | ||||
| if (wxOrder == null) wxOrder = new WxOrder(); | |||||
| wxOrder.setCUserId(user.getUserId()); | |||||
| if (wxOrder == null){ | |||||
| wxOrder = new WxOrder(); | |||||
| } | |||||
| wxOrder.setCUserId(getMemberId()); | |||||
| wxOrder.setSortColumns(BaseEntity.SortField.UpdateDate_DESC); | wxOrder.setSortColumns(BaseEntity.SortField.UpdateDate_DESC); | ||||
| final PageInfo<WxOrderCouponVo> page = wxOrderService.listCUserVoAsPage(wxOrder, pageNum, pageSize); | final PageInfo<WxOrderCouponVo> page = wxOrderService.listCUserVoAsPage(wxOrder, pageNum, pageSize); | ||||
| @@ -312,11 +304,6 @@ public class WxOrderController extends BaseController { | |||||
| if (StringUtils.isBlank(orderId) || orderId.equalsIgnoreCase(Constant.UNDEFINED)) { | if (StringUtils.isBlank(orderId) || orderId.equalsIgnoreCase(Constant.UNDEFINED)) { | ||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); | ||||
| } | } | ||||
| WxCUser user = getUser(); | |||||
| if (!user.isBasicInfo()) { | |||||
| logger.error("暂未成为会员,请授权手机号"); | |||||
| return new ResultData(ErrorCode.USER_IS_NOT_MEMBER.getCode(), "暂未成为会员,请授权手机号"); | |||||
| } | |||||
| // c端用户应该只能看到自己的订单细节 | // c端用户应该只能看到自己的订单细节 | ||||
| WxOrder wxOrder = new WxOrder(); | WxOrder wxOrder = new WxOrder(); | ||||
| Long id = 0L; | Long id = 0L; | ||||
| @@ -327,7 +314,7 @@ public class WxOrderController extends BaseController { | |||||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "订单ID转换异常"); | return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "订单ID转换异常"); | ||||
| } | } | ||||
| wxOrder.setId(id); | wxOrder.setId(id); | ||||
| wxOrder.setCUserId(user.getUserId()); | |||||
| wxOrder.setCUserId(getMemberId()); | |||||
| WxOrderCouponVo wxOrderCVo = wxOrderService.detailCUserVo(wxOrder); | WxOrderCouponVo wxOrderCVo = wxOrderService.detailCUserVo(wxOrder); | ||||
| if (wxOrderCVo == null) | if (wxOrderCVo == null) | ||||
| return new ResultData(ErrorCode.ORDER_IS_NOT_FIND); | return new ResultData(ErrorCode.ORDER_IS_NOT_FIND); | ||||
| @@ -407,17 +394,12 @@ public class WxOrderController extends BaseController { | |||||
| WxOrder order = null; | WxOrder order = null; | ||||
| try { | try { | ||||
| WxCUser cuser = getUser(); | |||||
| if (!cuser.isBasicInfo()) { | |||||
| logger.error("暂未成为会员,请授权手机号"); | |||||
| return new ResultData(ErrorCode.USER_IS_NOT_MEMBER.getCode(), "暂未成为会员,请授权手机号"); | |||||
| } | |||||
| WxCUserBasicInfo user = wxCUserBasicInfoService.getById(cuser.getUserId()); | |||||
| if(user == null) { | |||||
| logger.error("会员用户未找到: " + cuser.getUserId()); | |||||
| throw new MallinkException(ErrorCode.USER_IS_EMPTY.getCode(), "会员用户未找到" + cuser.getUserId()); | |||||
| WxCUserBasicInfo member = wxCUserBasicInfoService.getById(getMemberId()); | |||||
| if(member == null) { | |||||
| logger.error("会员用户未找到: " + getMemberId()); | |||||
| throw new MallinkException(ErrorCode.USER_IS_EMPTY.getCode(), "会员用户未找到" + getMemberId()); | |||||
| } | } | ||||
| order = wxOrderService.getUnPaidOrder(user, wxCoupon); | |||||
| order = wxOrderService.getUnPaidOrder(member, wxCoupon); | |||||
| if (order != null) { | if (order != null) { | ||||
| return new ResultData(Result.SUCCESS, "查询成功", order); | return new ResultData(Result.SUCCESS, "查询成功", order); | ||||
| } else { | } else { | ||||
| @@ -435,14 +417,9 @@ public class WxOrderController 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 pressOrderList(@ModelAttribute WxOrder wxOrder, Integer pageNum, Integer pageSize) { | public ResultData pressOrderList(@ModelAttribute WxOrder wxOrder, Integer pageNum, Integer pageSize) { | ||||
| WxCUser user = getUser(); | |||||
| if (!user.isBasicInfo()) { | |||||
| logger.error("暂未成为会员,请授权手机号"); | |||||
| return new ResultData(ErrorCode.USER_IS_NOT_MEMBER.getCode(), "暂未成为会员,请授权手机号"); | |||||
| } | |||||
| // c端用户应该只能看到自己的订单 | // c端用户应该只能看到自己的订单 | ||||
| if (wxOrder == null) wxOrder = new WxOrder(); | if (wxOrder == null) wxOrder = new WxOrder(); | ||||
| wxOrder.setCUserId(user.getUserId()); | |||||
| wxOrder.setCUserId(getMemberId()); | |||||
| wxOrder.setSortColumns(BaseEntity.SortField.CreateDate_DESC); | wxOrder.setSortColumns(BaseEntity.SortField.CreateDate_DESC); | ||||
| final PageInfo<WxOrderCouponPressVo> page = wxOrderService.listPressVoAsPage(wxOrder, pageNum, pageSize); | final PageInfo<WxOrderCouponPressVo> page = wxOrderService.listPressVoAsPage(wxOrder, pageNum, pageSize); | ||||
| return new ResultData(page); | return new ResultData(page); | ||||
| @@ -44,18 +44,13 @@ 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, userId); | |||||
| return wxOrderGroupService.queryRemainOne(wxOrderGroup, getMemberId()); | |||||
| } | } | ||||
| @@ -66,13 +61,8 @@ 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(user.getUserId()); | |||||
| wxOrder.setCUserId(getMemberId()); | |||||
| 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); | ||||
| @@ -126,15 +116,10 @@ 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(user.getUserId()); | |||||
| wxOrderGroup.setUserId(getMemberId()); | |||||
| wxOrderGroup.updateTenantInfo(getTenantInfo()); | wxOrderGroup.updateTenantInfo(getTenantInfo()); | ||||
| return wxOrderGroupService.queryAttendStatus(wxOrderGroup); | return wxOrderGroupService.queryAttendStatus(wxOrderGroup); | ||||
| } | } | ||||
| @@ -154,15 +154,8 @@ 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 = user.getUserId(); | |||||
| // 检查此人是否已参与砍价 | // 检查此人是否已参与砍价 | ||||
| boolean hadJoin = wxOrderPressService.checkCUserHasJoin(order, cUserId); | |||||
| boolean hadJoin = wxOrderPressService.checkCUserHasJoin(order, getMemberId()); | |||||
| if (hadJoin) { | if (hadJoin) { | ||||
| redisLock.unlock(orderIdStr, timeStr); | redisLock.unlock(orderIdStr, timeStr); | ||||
| logger.error("用户已参与砍价"); | logger.error("用户已参与砍价"); | ||||
| @@ -170,7 +163,7 @@ public class WxPressOrderController extends BaseController { | |||||
| } | } | ||||
| try { | try { | ||||
| WxOrderPress orderPress = wxOrderPressService.pressCouponJoin(order, wxCouponCVo, cUserId); | |||||
| WxOrderPress orderPress = wxOrderPressService.pressCouponJoin(order, wxCouponCVo, getMemberId()); | |||||
| if (orderPress != null) { | if (orderPress != null) { | ||||
| // 更新砍价信息 | // 更新砍价信息 | ||||
| Integer index = order.getPressCurrentNum() + 1; | Integer index = order.getPressCurrentNum() + 1; | ||||
| @@ -232,11 +225,6 @@ 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不能为空"); | ||||
| @@ -253,11 +241,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(user.getUserId())) { | |||||
| if(order.getCUserId().equals(getMemberId())) { | |||||
| 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, user.getUserId()); | |||||
| int status = wxOrderPressService.pressCouponStatus(order, getMemberId()); | |||||
| ret.put("status", status); | ret.put("status", status); | ||||
| return new ResultData(ret); | return new ResultData(ret); | ||||
| } | } | ||||
| @@ -43,11 +43,6 @@ 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(); | ||||
| @@ -73,7 +68,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(user.getUserId()); | |||||
| wxQuestionLog.setUserId(getMemberId()); | |||||
| wxQuestionLog.updateTenantInfo(wxQuestionConfig); | wxQuestionLog.updateTenantInfo(wxQuestionConfig); | ||||
| if(wxQuestionService.findLogList(wxQuestionLog).size()>0){ | if(wxQuestionService.findLogList(wxQuestionLog).size()>0){ | ||||
| @@ -93,11 +88,6 @@ 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) | ||||
| @@ -115,10 +105,10 @@ public class WxQuestionController extends BaseController { | |||||
| } | } | ||||
| wxQuestionLog.setAnswer(JSONObject.toJSONString(as)); | wxQuestionLog.setAnswer(JSONObject.toJSONString(as)); | ||||
| wxCUserTagsService.assignTags(as, wxCUserBasicInfoService.getById(user.getUserId())); | |||||
| wxCUserTagsService.assignTags(as, wxCUserBasicInfoService.getById(getMemberId())); | |||||
| } | } | ||||
| wxQuestionLog.setUserId(user.getUserId()); | |||||
| wxQuestionLog.setUserId(getMemberId()); | |||||
| wxQuestionService.saveOrUpdateLog(wxQuestionLog); | wxQuestionService.saveOrUpdateLog(wxQuestionLog); | ||||
| return new ResultData(); | return new ResultData(); | ||||
| @@ -29,14 +29,9 @@ 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(user.getUserId()); | |||||
| wxScoreHistory.setCUserId(getMemberId()); | |||||
| 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); | ||||
| @@ -751,6 +751,21 @@ public class WxUserGrantController extends BaseController { | |||||
| WxCUser user = getUser(); | WxCUser user = getUser(); | ||||
| WxCUserVo userVo = new WxCUserVo(); | WxCUserVo userVo = new WxCUserVo(); | ||||
| org.springframework.beans.BeanUtils.copyProperties(user, userVo); | org.springframework.beans.BeanUtils.copyProperties(user, userVo); | ||||
| userVo.setScore(0); | |||||
| userVo.setCredit(0); | |||||
| if(user.isBasicInfo()){ | |||||
| WxCUserBasicInfo wxCUserBasicInfo = wxCUserBasicInfoService.getById(user.getUserId()); | |||||
| if (wxCUserBasicInfo != null) { | |||||
| userVo.setScore(wxCUserBasicInfo.getPoins()); | |||||
| userVo.setCredit(wxCUserBasicInfo.getCredit()); | |||||
| userVo.setName(wxCUserBasicInfo.getName()); | |||||
| userVo.setBirthdate(wxCUserBasicInfo.getBirthdate()); | |||||
| userVo.setSex(wxCUserBasicInfo.getSex()); | |||||
| userVo.setAddress(wxCUserBasicInfo.getAddress()); | |||||
| userVo.setStatus(wxCUserBasicInfo.getStatus()); | |||||
| } | |||||
| } | |||||
| if (userVo.getScore() == null) | if (userVo.getScore() == null) | ||||
| userVo.setScore(0); | userVo.setScore(0); | ||||
| Integer levelScore = 0; | Integer levelScore = 0; | ||||
| @@ -781,36 +796,19 @@ public class WxUserGrantController extends BaseController { | |||||
| userVo.setUpgradeScore(levelTarget-userVo.getScore()); | userVo.setUpgradeScore(levelTarget-userVo.getScore()); | ||||
| } | } | ||||
| 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); | ||||
| } | } | ||||
| @ApiOperation("当前用户名下是否有车") | @ApiOperation("当前用户名下是否有车") | ||||
| @GetMapping("/carCount") | @GetMapping("/carCount") | ||||
| public ResultData carCount() { | public ResultData carCount() { | ||||
| WxCUser user = getUser(); | |||||
| if (!user.isBasicInfo()) { | |||||
| logger.error("暂未成为会员,请授权手机号"); | |||||
| return new ResultData(ErrorCode.USER_IS_NOT_MEMBER.getCode(), "暂未成为会员,请授权手机号"); | |||||
| } | |||||
| WxCUserBasicInfo member = getMember(); | |||||
| WxCUserCar userCar = new WxCUserCar(); | WxCUserCar userCar = new WxCUserCar(); | ||||
| userCar.setCUserId(user.getUserId()); | |||||
| userCar.setCUserId(member.getId()); | |||||
| Integer count = wxCUserCarService.countUserCar(userCar); | Integer count = wxCUserCarService.countUserCar(userCar); | ||||
| if (count > 0) { | if (count > 0) { | ||||
| Map returnMap = new HashMap(); | Map returnMap = new HashMap(); | ||||
| String phone = user.getPhone(); | |||||
| if (phone.contains("*")) | |||||
| phone = user.getVerifyCodePhone(); | |||||
| String phone = member.getPhone(); | |||||
| returnMap.put("phone", phone); | returnMap.put("phone", phone); | ||||
| returnMap.put("count", count); | returnMap.put("count", count); | ||||
| return new ResultData(Result.SUCCESS, "count获取成功", returnMap); | return new ResultData(Result.SUCCESS, "count获取成功", returnMap); | ||||
| @@ -824,13 +822,8 @@ 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.setCUserId(getUser().getUserId()); | |||||
| userCar.setCUserId(getMemberId()); | |||||
| List<WxCUserCar> list = wxCUserCarService.getList(userCar); | List<WxCUserCar> list = wxCUserCarService.getList(userCar); | ||||
| return new ResultData(Result.SUCCESS, "获取查询成功", list); | return new ResultData(Result.SUCCESS, "获取查询成功", list); | ||||
| } | } | ||||
| @@ -882,11 +875,6 @@ 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); | ||||
| @@ -897,12 +885,13 @@ public class WxUserGrantController extends BaseController { | |||||
| wxCUserBasicInfo.getSex() != null || | wxCUserBasicInfo.getSex() != null || | ||||
| wxCUserBasicInfo.getAddress() != null) { | wxCUserBasicInfo.getAddress() != null) { | ||||
| WxCUserBasicInfo record = new WxCUserBasicInfo(); | WxCUserBasicInfo record = new WxCUserBasicInfo(); | ||||
| record.setId(getMemberId()); | |||||
| record.updateTenantInfo(tenantEntity); | record.updateTenantInfo(tenantEntity); | ||||
| record.setName(wxCUserBasicInfo.getName()); | record.setName(wxCUserBasicInfo.getName()); | ||||
| record.setAvatarUrl(wxCUserBasicInfo.getAvatarUrl()); | |||||
| record.setBirthdate(wxCUserBasicInfo.getBirthdate()); | record.setBirthdate(wxCUserBasicInfo.getBirthdate()); | ||||
| record.setSex(wxCUserBasicInfo.getSex()); | record.setSex(wxCUserBasicInfo.getSex()); | ||||
| record.setAddress(wxCUserBasicInfo.getAddress()); | record.setAddress(wxCUserBasicInfo.getAddress()); | ||||
| record.setId(getUser().getUserId()); | |||||
| record.setUpdateDate(new Date()); | record.setUpdateDate(new Date()); | ||||
| wxCUserBasicInfoService.update(record); | wxCUserBasicInfoService.update(record); | ||||
| wxScoreRulesService.addScore(EnumScoreType.COMPLETE_INFO, record); | wxScoreRulesService.addScore(EnumScoreType.COMPLETE_INFO, record); | ||||
| @@ -913,7 +902,7 @@ public class WxUserGrantController extends BaseController { | |||||
| wxCreditHistory.setCreateDate(new Date()); | wxCreditHistory.setCreateDate(new Date()); | ||||
| wxCreditHistory.setCreditType(EnumScoreType.COMPLETE_INFO.getCode()); | wxCreditHistory.setCreditType(EnumScoreType.COMPLETE_INFO.getCode()); | ||||
| wxCreditHistory.setOperatorType(EnumUserType.CUSER.getCode()); | wxCreditHistory.setOperatorType(EnumUserType.CUSER.getCode()); | ||||
| wxCreditHistory.setOperatorId(getUser().getUserId()); | |||||
| wxCreditHistory.setOperatorId(getMemberId()); | |||||
| wxCreditHistoryService.saveOrUpdate(wxCreditHistory); | wxCreditHistoryService.saveOrUpdate(wxCreditHistory); | ||||
| wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_IMPORT, record); | wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_IMPORT, record); | ||||
| } | } | ||||
| @@ -70,6 +70,9 @@ public class AuthorizationInterceptor extends HandlerInterceptorAdapter { | |||||
| if (StringUtils.isNotBlank(wxCUser.getParentTenantId())) { | if (StringUtils.isNotBlank(wxCUser.getParentTenantId())) { | ||||
| request.setAttribute(Constant.PARENT_TENANT_ID, wxCUser.getParentTenantId()); | request.setAttribute(Constant.PARENT_TENANT_ID, wxCUser.getParentTenantId()); | ||||
| } | } | ||||
| if(wxCUser.isBasicInfo()){ | |||||
| request.setAttribute(Constant.LOGIN_MEMBER_KEY, wxCUser.getUserId()); | |||||
| } | |||||
| //如果是要不需要自动设置tenantI信息 | //如果是要不需要自动设置tenantI信息 | ||||
| @@ -23,6 +23,7 @@ public class Constant { | |||||
| // C端token | // C端token | ||||
| public static final String LOGIN_USER_KEY = "LOGIN_USER_KEY"; | public static final String LOGIN_USER_KEY = "LOGIN_USER_KEY"; | ||||
| public static final String LOGIN_MEMBER_KEY = "LOGIN_MEMBER_KEY"; | |||||
| public static final String TENANT_ID = "TENANT_ID"; | public static final String TENANT_ID = "TENANT_ID"; | ||||
| public static final String PARENT_TENANT_ID = "PARENT_TENANT_ID"; | public static final String PARENT_TENANT_ID = "PARENT_TENANT_ID"; | ||||