| @@ -60,12 +60,21 @@ public class BaseController { | |||
| }); | |||
| } | |||
| public String getTenantId() { | |||
| HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); | |||
| String tenantId = (String) request.getAttribute(AuthorizationInterceptor.TENANT_ID); | |||
| return tenantId; | |||
| } | |||
| public Long getUserId() { | |||
| HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); | |||
| Long cUserId = (Long) request.getAttribute(AuthorizationInterceptor.LOGIN_USER_KEY); | |||
| return cUserId; | |||
| } | |||
| /** | |||
| * 请尽量多用getTenantId, getUserId | |||
| */ | |||
| public WxCUser getUser() { | |||
| Long cUserId = getUserId(); | |||
| WxCUser user = wxCUserService.getById(cUserId); | |||
| @@ -74,12 +83,6 @@ public class BaseController { | |||
| return user; | |||
| } | |||
| public String getTenantId() { | |||
| HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest(); | |||
| String tenantId = (String) request.getAttribute(AuthorizationInterceptor.TENANT_ID); | |||
| return tenantId; | |||
| } | |||
| public WxAppinfo getAppInfo(String appId) { | |||
| return wxAppinfoService.getByAppId(appId); | |||
| } | |||
| @@ -36,7 +36,6 @@ public class WxBusinessController extends BaseController { | |||
| @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) | |||
| public ResultData list(WxBusiness wxBusiness, Integer pageNum, Integer pageSize) { | |||
| if (null == wxBusiness) wxBusiness = new WxBusiness(); | |||
| WxCUser user = getUser(); | |||
| final PageInfo<WxBusiness> page = wxBusinessService.listAsPage(wxBusiness, pageNum, pageSize); | |||
| return new ResultData(page); | |||
| } | |||
| @@ -59,9 +59,9 @@ public class WxCarController extends BaseController { | |||
| @Autowired | |||
| WxCarCmdLogService wxCarCmdLogService; | |||
| private WxPark getCurrentPark(WxCUser user) { | |||
| private WxPark getCurrentPark(String tenantId) { | |||
| WxPark parkQ = new WxPark(); | |||
| parkQ.setTenantId(user.getTenantId()); | |||
| parkQ.setTenantId(tenantId); | |||
| WxPark wxPark = wxParkService.getByObj(parkQ); | |||
| // 1, get mall's park | |||
| // future use redis to optimize | |||
| @@ -71,9 +71,8 @@ public class WxCarController extends BaseController { | |||
| @ApiOperation(value = "获取车场支持的厂家",notes="返回\n{\"vendor\":integer}") | |||
| @GetMapping("/getVendor") | |||
| public ResultData getVendor() { | |||
| WxCUser user = getUser(); | |||
| // 1, get mall's park | |||
| WxPark park = getCurrentPark(user); | |||
| WxPark park = getCurrentPark(getTenantId()); | |||
| Map map = new HashMap(); | |||
| map.put("vendor", park.getVendorType()); | |||
| return new ResultData(map); | |||
| @@ -89,7 +88,7 @@ public class WxCarController extends BaseController { | |||
| public ResultData init(@RequestBody Map<String, String > paramMap) { | |||
| WxCUser user = getUser(); | |||
| // 1, get mall's park | |||
| WxPark park = getCurrentPark(user); | |||
| WxPark park = getCurrentPark(getTenantId()); | |||
| // 2. get vendor params | |||
| if (park.getVendorType() == EnumCarVendor.CAR_ETCP.getCode()) { | |||
| String phone = paramMap.get("phone"); | |||
| @@ -231,9 +230,8 @@ public class WxCarController extends BaseController { | |||
| "}\n") | |||
| @PostMapping("/bindCar") | |||
| public ResultData bindCar(@RequestBody Map<String, String > paramMap) { | |||
| WxCUser user = getUser(); | |||
| // 1, get mall's park | |||
| WxPark park = getCurrentPark(user); | |||
| WxPark park = getCurrentPark(getTenantId()); | |||
| // 2. get vendor params | |||
| if (park.getVendorType() == EnumCarVendor.CAR_ETCP.getCode()) { | |||
| String etcpToken = paramMap.get("etcpToken"); | |||
| @@ -259,8 +257,8 @@ public class WxCarController extends BaseController { | |||
| // 插入车牌 | |||
| Date curr = new Date(); | |||
| WxCUserCar userCar = new WxCUserCar(); | |||
| userCar.setCUserId(user.getId()); | |||
| userCar.setTenantId(user.getTenantId()); | |||
| userCar.setCUserId(getUserId()); | |||
| userCar.setTenantId(getTenantId()); | |||
| userCar.setCarNumber(carNumber); | |||
| userCar.setVendorType(EnumCarVendor.CAR_ETCP.getCode()); | |||
| userCar.setCreateDate(curr); | |||
| @@ -269,7 +267,7 @@ public class WxCarController extends BaseController { | |||
| wxScoreRulesService.addScore(EnumScoreType.BIND_CAR,userCar); | |||
| JSONObject dataObj = retObj.getJSONObject("data"); | |||
| wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_CAR,user); | |||
| wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_CAR,getUserId()); | |||
| return new ResultData(dataObj); | |||
| } else { | |||
| String message = retObj.getString("message"); | |||
| @@ -311,8 +309,8 @@ public class WxCarController extends BaseController { | |||
| Date curr = new Date(); | |||
| WxCUserCar userCar = new WxCUserCar(); | |||
| userCar.setId(newCarId); | |||
| userCar.setCUserId(user.getId()); | |||
| userCar.setTenantId(user.getTenantId()); | |||
| userCar.setCUserId(getUserId()); | |||
| userCar.setTenantId(getTenantId()); | |||
| userCar.setCarNumber(carNumber); | |||
| userCar.setVendorType(EnumCarVendor.CAR_TJD.getCode()); | |||
| JSONObject jo = new JSONObject(); | |||
| @@ -328,7 +326,7 @@ public class WxCarController extends BaseController { | |||
| return new ResultData(ErrorCode.DB_FAIL.getCode(), "TJD保存车牌失败, e:" + e.getMessage()); | |||
| } | |||
| wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_CAR,user); | |||
| wxCUserTagsService.triggerAssignTags(EnumAssignTagsTrigger.ASSIGN_TAGS_TRIGGER_CAR,getUserId()); | |||
| return new ResultData(retObj); | |||
| } else { | |||
| return new ResultData(ErrorCode.TJD_BIND_FAIL.getCode(), "绑车牌失败", retObj); | |||
| @@ -357,9 +355,8 @@ public class WxCarController extends BaseController { | |||
| "}\n") | |||
| @PostMapping("/unbindCar") | |||
| public ResultData unbindCar(@RequestBody Map<String, String > paramMap) { | |||
| WxCUser user = getUser(); | |||
| // 1, get mall's park | |||
| WxPark park = getCurrentPark(user); | |||
| WxPark park = getCurrentPark(getTenantId()); | |||
| if (park.getVendorType() == EnumCarVendor.CAR_ETCP.getCode()) { | |||
| String etcpToken = paramMap.get("etcpToken"); | |||
| if (StringUtils.isBlank(etcpToken)) { | |||
| @@ -383,8 +380,8 @@ public class WxCarController extends BaseController { | |||
| if (retObj.getIntValue("code") == 0) { | |||
| try { | |||
| WxCUserCar userCar = new WxCUserCar(); | |||
| userCar.setCUserId(user.getId()); | |||
| userCar.setTenantId(user.getTenantId()); | |||
| userCar.setCUserId(getUserId()); | |||
| userCar.setTenantId(getTenantId()); | |||
| userCar.setCarNumber(carNumber); | |||
| wxCUserCarService.deleteByObj(userCar); | |||
| } catch (Exception e) { | |||
| @@ -406,8 +403,8 @@ public class WxCarController extends BaseController { | |||
| } | |||
| WxCUserCar queryOne = new WxCUserCar(); | |||
| queryOne.setCarNumber(carNumber); | |||
| queryOne.setTenantId(user.getTenantId()); | |||
| queryOne.setCUserId(user.getId()); | |||
| queryOne.setTenantId(getTenantId()); | |||
| queryOne.setCUserId(getUserId()); | |||
| WxCUserCar userCar = wxCUserCarService.getOne(queryOne); | |||
| if (userCar != null) { | |||
| String params = userCar.getVendorParams(); | |||
| @@ -481,9 +478,8 @@ public class WxCarController extends BaseController { | |||
| " }") | |||
| @PostMapping("/getCarStopFee") | |||
| public ResultData getCarStopFee(@RequestBody Map<String, String > paramMap) { | |||
| WxCUser user = getUser(); | |||
| // 1, get mall's park | |||
| WxPark park = getCurrentPark(user); | |||
| WxPark park = getCurrentPark(getTenantId()); | |||
| if (park.getVendorType() == EnumCarVendor.CAR_ETCP.getCode()) { | |||
| String etcpToken = paramMap.get("etcpToken"); | |||
| String carNumber = paramMap.get("carNumber"); | |||
| @@ -564,9 +560,8 @@ public class WxCarController extends BaseController { | |||
| " }") | |||
| @PostMapping("/deductionFee") | |||
| public ResultData deductionFee(@RequestBody Map<String, String > paramMap) { | |||
| WxCUser user = getUser(); | |||
| /// 1, get mall's park | |||
| WxPark park = getCurrentPark(user); | |||
| WxPark park = getCurrentPark(getTenantId()); | |||
| if (park.getVendorType() == EnumCarVendor.CAR_TJD.getCode()) { | |||
| String tradeId = paramMap.get("tradeId"); | |||
| String deductionAmount = paramMap.get("deductionAmount"); | |||
| @@ -617,9 +612,8 @@ public class WxCarController extends BaseController { | |||
| @ApiOperation(value = "优免券领取", notes="ETCP:={\"etcpToken\":\"string\",\"carNumber\":\"string\",\"couponOrderId\"=\"String\"},输出\n{}") | |||
| @PostMapping("/getCoupon") | |||
| public ResultData getCoupon(@RequestBody Map<String, String > paramMap) { | |||
| WxCUser user = getUser(); | |||
| /// 1, get mall's park | |||
| WxPark park = getCurrentPark(user); | |||
| WxPark park = getCurrentPark(getTenantId()); | |||
| if (park.getVendorType() == EnumCarVendor.CAR_ETCP.getCode()) { | |||
| String etcpToken = paramMap.get("etcpToken"); | |||
| String carNumber = paramMap.get("carNumber"); | |||
| @@ -644,8 +638,8 @@ public class WxCarController extends BaseController { | |||
| WxCouponOrderCarCVo userCar = null; | |||
| WxCouponOrder userCarQ = new WxCouponOrder(); | |||
| userCarQ.setTenantId(user.getTenantId()); | |||
| userCarQ.setcUserId(user.getId()); | |||
| userCarQ.setTenantId(getTenantId()); | |||
| userCarQ.setcUserId(getUserId()); | |||
| userCarQ.setId(couponOrderId); | |||
| userCarQ.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USE_WAIT.getCode()); | |||
| List<WxCouponOrderCarCVo> list = wxCouponOrderService.carListCUserVo(userCarQ); | |||
| @@ -681,7 +675,7 @@ public class WxCarController extends BaseController { | |||
| // 券状态设为已使用 | |||
| WxCouponOrder couponOrder = new WxCouponOrder(); | |||
| couponOrder.setId(userCar.getId()); | |||
| couponOrder.setTenantId(user.getTenantId()); | |||
| couponOrder.setTenantId(getTenantId()); | |||
| couponOrder.setUpdateDate(new Date()); | |||
| couponOrder.setCouponOrderStatus(EnumCouponOrderStatus.COUPON_ORDER_USED.getCode()); | |||
| try { | |||
| @@ -710,9 +704,8 @@ public class WxCarController extends BaseController { | |||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); | |||
| } | |||
| if (wxCouponOrder == null) wxCouponOrder = new WxCouponOrderCarCVo(); | |||
| WxCUser user = getUser(); | |||
| wxCouponOrder.setTenantId(user.getTenantId()); | |||
| wxCouponOrder.setcUserId(user.getId()); | |||
| wxCouponOrder.setTenantId(getTenantId()); | |||
| wxCouponOrder.setcUserId(getUserId()); | |||
| if (wxCouponOrder.getCouponOrderStatus() == null) | |||
| wxCouponOrder.setSortColumns(WxCouponOrder.Field.CreateDate_DESC); | |||
| else if (wxCouponOrder.getCouponOrderStatus() == EnumCouponOrderStatus.COUPON_ORDER_USE_WAIT.getCode()) | |||
| @@ -725,9 +718,8 @@ public class WxCarController extends BaseController { | |||
| @ApiOperation(value = "停车场状态") | |||
| @GetMapping("/getParkStatus") | |||
| public ResultData getParkStatus() { | |||
| WxCUser user = getUser(); | |||
| /// 1, get mall's park | |||
| WxPark park = getCurrentPark(user); | |||
| WxPark park = getCurrentPark(getTenantId()); | |||
| if (park.getVendorType() == EnumCarVendor.CAR_ETCP.getCode()) { | |||
| String params = park.getVendorParams(); | |||
| if(params == null) { | |||
| @@ -90,8 +90,6 @@ public class WxCardPayController extends BaseController { | |||
| Integer payment = totalFee.multiply(new BigDecimal(100)).intValue(); | |||
| WxCUser user = getUser(); | |||
| WxCardInfo cardInfo = wxCardInfoService.getById(cardId); | |||
| if(cardInfo == null) { | |||
| logger.error("卡不存在: " + cardIdStr); | |||
| @@ -105,7 +103,7 @@ public class WxCardPayController extends BaseController { | |||
| //查看所有者与扫码者是否为一致 | |||
| WxCouponOrder couponOrder = wxCouponOrderService.getById(cardId); | |||
| if (!couponOrder.getOwnerId().equals(user.getId())) { | |||
| if (!couponOrder.getOwnerId().equals(getUserId())) { | |||
| logger.error("卡已被领取: " + cardIdStr); | |||
| return new ResultData(ErrorCode.CARD_TRANSFERED); | |||
| } | |||
| @@ -124,7 +122,7 @@ public class WxCardPayController extends BaseController { | |||
| WxOrder order = null; | |||
| try { | |||
| order = wxOrderService.saveCardPayOrder(merchant, user, totalFeeStr, payment); | |||
| order = wxOrderService.saveCardPayOrder(merchant, getUserId(), totalFeeStr, payment); | |||
| } catch (MallinkException e) { | |||
| logger.error("saveCardPayOrder 1" + e.getMessage()); | |||
| return new ResultData(e.getErrorCode(), e.getMessage()); | |||
| @@ -136,14 +134,14 @@ public class WxCardPayController extends BaseController { | |||
| WxCardSpend record = new WxCardSpend(); | |||
| record.setTenantId(merchant.getTenantId()); | |||
| record.setCardId(cardId); | |||
| record.setOwnerId(user.getId()); | |||
| record.setOwnerId(getUserId()); | |||
| record.setMerchantId(merchantId); | |||
| record.setOrderId(order.getId()); | |||
| record.setIp(ipStr); | |||
| record.setDeductionAmount(payment); | |||
| try { | |||
| return wxCardSpendService.createCardSpend(record, order, couponMerchant, user); | |||
| return wxCardSpendService.createCardSpend(record, order, couponMerchant); | |||
| } catch (MallinkException e) { | |||
| logger.error("card spend error, req 2: " + record.toString() + ", e:" + e.getMessage()); | |||
| return new ResultData(e.getErrorCode(), e.getMessage()); | |||
| @@ -162,9 +160,8 @@ public class WxCardPayController extends BaseController { | |||
| String ipStr = getIpAddr(); | |||
| logger.info("saveCardPayOrder: " + ipStr + " :" + wxCardSpend.toString()); | |||
| if (wxCardSpend == null) wxCardSpend = new WxCardSpendVo(); | |||
| WxCUser user = getUser(); | |||
| wxCardSpend.setTenantId(user.getTenantId()); | |||
| wxCardSpend.setOwnerId(user.getId()); | |||
| wxCardSpend.setTenantId(getTenantId()); | |||
| wxCardSpend.setOwnerId(getUserId()); | |||
| final PageInfo<WxCardSpendVo> page = wxCardSpendService.listAsPage(wxCardSpend, pageNum, pageSize); | |||
| return new ResultData(page); | |||
| } | |||
| @@ -175,9 +172,8 @@ public class WxCardPayController extends BaseController { | |||
| String ipStr = getIpAddr(); | |||
| logger.info("sumCardSpendList: " + ipStr + " :" + wxCardSpend.toString()); | |||
| if (wxCardSpend == null) wxCardSpend = new WxCardSpendVo(); | |||
| WxCUser user = getUser(); | |||
| wxCardSpend.setTenantId(user.getTenantId()); | |||
| wxCardSpend.setOwnerId(user.getId()); | |||
| wxCardSpend.setTenantId(getTenantId()); | |||
| wxCardSpend.setOwnerId(getUserId()); | |||
| final List<Map<String, Object>> mapList = wxCardSpendService.sumCardSpendForOwner(wxCardSpend); | |||
| return new ResultData(mapList); | |||
| } | |||
| @@ -49,7 +49,7 @@ public class WxCouponOrderController extends BaseController { | |||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); | |||
| } | |||
| if (wxCouponOrder == null) wxCouponOrder = new WxCouponOrderCVo(); | |||
| wxCouponOrder.setcUserId(getUser().getId()); | |||
| wxCouponOrder.setcUserId(getUserId()); | |||
| if (wxCouponOrder.getCouponOrderStatus() == null) | |||
| wxCouponOrder.setSortColumns(WxCouponOrder.Field.CreateDate_DESC); | |||
| else if (wxCouponOrder.getCouponOrderStatus() == EnumCouponOrderStatus.COUPON_ORDER_USE_WAIT.getCode()) | |||
| @@ -139,9 +139,8 @@ public class WxCouponOrderController extends BaseController { | |||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); | |||
| } | |||
| if (cardCVo == null) cardCVo = new WxCardCVo(); | |||
| WxCUser user = getUser(); | |||
| cardCVo.setTenantId(user.getTenantId()); | |||
| cardCVo.setOwnerId(user.getId()); | |||
| cardCVo.setTenantId(getTenantId()); | |||
| cardCVo.setOwnerId(getUserId()); | |||
| if(StringUtils.isNotBlank(cardCVo.getStatusStr())) { | |||
| String [] statusAttr = cardCVo.getStatusStr().split(","); | |||
| List<Integer> tmpList = new ArrayList<Integer>(); | |||
| @@ -84,8 +84,7 @@ public class WxMallController extends BaseController { | |||
| @ApiOperation("商场信息") | |||
| @GetMapping("/mallInfo") | |||
| public ResultData getMallInfo() { | |||
| WxCUser user = getUser(); | |||
| WxMall mall = wxMallService.getByTenantId(user.getTenantId()); | |||
| WxMall mall = wxMallService.getByTenantId(getTenantId()); | |||
| if (mall == null) { | |||
| return new ResultData(ErrorCode.MALL_INFO_NOT_FOUND); | |||
| } | |||
| @@ -95,11 +94,10 @@ public class WxMallController extends BaseController { | |||
| @ApiOperation("成长值相关信息") | |||
| @GetMapping("/scoreLevelInfo") | |||
| public ResultData getScoreLevelInfo() { | |||
| WxCUser user = getUser(); | |||
| Map map = new HashMap(); | |||
| WxScoreRules scoreRules = wxScoreRulesService.getScoreRules(user.getTenantId()); | |||
| WxScoreRules scoreRules = wxScoreRulesService.getScoreRules(getTenantId()); | |||
| map.put("score", scoreRules); | |||
| List<WxLevelConfig> levelConfigList = wxLevelConfigService.getByTenantId(user.getTenantId()); | |||
| List<WxLevelConfig> levelConfigList = wxLevelConfigService.getByTenantId(getTenantId()); | |||
| boolean disscountEnable = false; | |||
| for(WxLevelConfig levelConfig: levelConfigList) { | |||
| if (levelConfig.getDiscountEnable() > 0 ) { | |||
| @@ -69,12 +69,10 @@ public class WxOrderController extends BaseController { | |||
| couponId = wxCouponChannel.getCouponId(); | |||
| } | |||
| WxCUser user = getUser(); | |||
| WxOrder order = null; | |||
| try { | |||
| order = wxOrderService.saveFreeCouponOrder(user.getId(), couponChannelId, couponId); | |||
| order = wxOrderService.saveFreeCouponOrder(getUserId(), couponChannelId, couponId); | |||
| return new ResultData(order); | |||
| } catch (MallinkException e) { | |||
| logger.error(e.getMessage()); | |||
| @@ -188,7 +186,6 @@ public class WxOrderController extends BaseController { | |||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "orderId不能为空"); | |||
| } | |||
| Long orderId = 0L; | |||
| WxCUser user = getUser(); | |||
| try { | |||
| orderId = Long.valueOf(orderIdStr); | |||
| } catch (NumberFormatException e) { | |||
| @@ -218,7 +215,6 @@ public class WxOrderController extends BaseController { | |||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "退款订单ID不能为空"); | |||
| } | |||
| Long orderId = 0L; | |||
| WxCUser user = getUser(); | |||
| try { | |||
| orderId = Long.valueOf(orderIdStr); | |||
| } catch (NumberFormatException e) { | |||
| @@ -246,7 +242,7 @@ public class WxOrderController extends BaseController { | |||
| public ResultData list(@ModelAttribute WxOrder wxOrder, Integer pageNum, Integer pageSize) { | |||
| // c端用户应该只能看到自己的订单 | |||
| if (wxOrder == null) wxOrder = new WxOrder(); | |||
| wxOrder.setcUserId(getUser().getId()); | |||
| wxOrder.setcUserId(getUserId()); | |||
| wxOrder.setSortColumns(WxOrder.Field.UpdateDate_DESC); | |||
| final PageInfo<WxOrderCouponVo> page = wxOrderService.listCUserVoAsPage(wxOrder, pageNum, pageSize); | |||
| @@ -283,7 +279,7 @@ public class WxOrderController extends BaseController { | |||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "订单ID转换异常"); | |||
| } | |||
| wxOrder.setId(id); | |||
| wxOrder.setcUserId(getUser().getId()); | |||
| wxOrder.setcUserId(getUserId()); | |||
| WxOrderCouponVo wxOrderCVo = wxOrderService.detailCUserVo(wxOrder); | |||
| if (wxOrderCVo == null) | |||
| return new ResultData(ErrorCode.ORDER_IS_NOT_FIND); | |||
| @@ -339,8 +335,7 @@ public class WxOrderController extends BaseController { | |||
| public ResultData pressOrderList(@ModelAttribute WxOrder wxOrder, Integer pageNum, Integer pageSize) { | |||
| // c端用户应该只能看到自己的订单 | |||
| if (wxOrder == null) wxOrder = new WxOrder(); | |||
| WxCUser user = getUser(); | |||
| wxOrder.setcUserId(user.getId()); | |||
| wxOrder.setcUserId(getUserId()); | |||
| wxOrder.setSortColumns(WxOrder.Field.CreateDate_DESC); | |||
| final PageInfo<WxOrderCouponPressVo> page = wxOrderService.listPressVoAsPage(wxOrder, pageNum, pageSize); | |||
| return new ResultData(page); | |||
| @@ -27,9 +27,8 @@ public class WxParkController extends BaseController { | |||
| @ApiOperation("查找用户车场信息") | |||
| @GetMapping("/info") | |||
| public ResultData findById() { | |||
| WxCUser user = getUser(); | |||
| WxPark parkQ = new WxPark(); | |||
| parkQ.setTenantId(user.getTenantId()); | |||
| parkQ.setTenantId(getTenantId()); | |||
| WxPark park = wxParkService.getByObj(parkQ); | |||
| if (park == null) { | |||
| logger.error("车场未取到"); | |||
| @@ -62,7 +62,6 @@ public class WxPressOrderController extends BaseController { | |||
| logger.error("orderId convert error, " + orderIdStr + ", e:" + e.getMessage()); | |||
| return new ResultData(ErrorCode.SYS_PARAMETER_CAST_ERROR.getCode(), "orderId: " + orderIdStr + ", e:" + e.getMessage()); | |||
| } | |||
| WxCUser user = getUser(); | |||
| WxOrder order = wxOrderService.getById(orderId); | |||
| if(order == null) { | |||
| logger.error("订单不存在:" + orderId); | |||
| @@ -100,7 +99,7 @@ public class WxPressOrderController extends BaseController { | |||
| } | |||
| try { | |||
| wxOrderPressService.pressCouponJoin(order, coupon, user); | |||
| wxOrderPressService.pressCouponJoin(order, coupon, getUserId()); | |||
| } catch (MallinkException e) { | |||
| logger.error(e.getMessage()); | |||
| return new ResultData(e.getErrorCode(), e.getMessage()); | |||
| @@ -124,17 +123,16 @@ public class WxPressOrderController extends BaseController { | |||
| logger.error("orderId convert error, " + orderId + ", e:" + e.getMessage()); | |||
| return new ResultData(ErrorCode.SYS_PARAMETER_CAST_ERROR.getCode(), "orderId: " + orderId + ", e:" + e.getMessage()); | |||
| } | |||
| WxCUser user = getUser(); | |||
| WxOrder order = wxOrderService.getById(orderIdL); | |||
| if(order == null) { | |||
| logger.error("订单不存在:" + orderId); | |||
| return new ResultData(ErrorCode.ORDER_IS_NOT_FIND); | |||
| } | |||
| if(order.getcUserId().equals(user.getId())) { | |||
| if(order.getcUserId().equals(getUserId())) { | |||
| ret.put("status", EnumOrderPressStatus.FIRST.getCode()); | |||
| return new ResultData(ret); | |||
| } | |||
| int status = wxOrderPressService.pressCouponStatus(order, user); | |||
| int status = wxOrderPressService.pressCouponStatus(order, getUserId()); | |||
| ret.put("status", status); | |||
| return new ResultData(ret); | |||
| } | |||
| @@ -28,10 +28,9 @@ public class WxScoreHistoryController extends BaseController { | |||
| @ApiImplicitParam(name = "pageNum", value = "页数", dataType = "int", paramType = "query", required = true), | |||
| @ApiImplicitParam(name = "pageSize", value = "每页条数", dataType = "int", paramType = "query", required = true)}) | |||
| public ResultData list(Integer pageNum, Integer pageSize) { | |||
| WxCUser user = getUser(); | |||
| WxScoreHistory wxScoreHistory = new WxScoreHistory(); | |||
| wxScoreHistory.setTenantId(user.getTenantId()); | |||
| wxScoreHistory.setCUserId(user.getId()); | |||
| wxScoreHistory.setTenantId(getTenantId()); | |||
| wxScoreHistory.setCUserId(getUserId()); | |||
| wxScoreHistory.setSortColumns(WxScoreHistory.Field.CreateDate_DESC); | |||
| final PageInfo<WxScoreHistory> page = wxScoreHistoryService.listAsPage(wxScoreHistory, pageNum, pageSize); | |||
| return new ResultData(page); | |||
| @@ -370,14 +370,13 @@ public class WxUserGrantController extends BaseController { | |||
| public ResultData checkUserStatus() { | |||
| Map resultMap = new HashMap(); | |||
| WxCUser user = getUser(); | |||
| if (!StringUtils.isBlank(user.getNickName())) { | |||
| if (StringUtils.isNotBlank(user.getNickName())) { | |||
| resultMap.put("nickName", user.getNickName()); | |||
| } | |||
| if (StringUtils.isBlank(user.getNickName())) { | |||
| } else { | |||
| logger.warn("用户昵称未授权,跳转到用户授权页!"); | |||
| return new ResultData(ErrorCode.NICK_NAME_NOT_FOUND.getCode(), "用户昵称未授权,请跳转到用户昵称授权页!", resultMap); | |||
| } | |||
| return new ResultData(Result.SUCCESS, "是老用户,已完成所有授权", resultMap); | |||
| return new ResultData(Result.SUCCESS, "是老用户,已完成用户昵称授权", resultMap); | |||
| } | |||
| /** | |||
| @@ -389,18 +388,19 @@ public class WxUserGrantController extends BaseController { | |||
| public ResultData checkPhoneStatus() { | |||
| Map resultMap = new HashMap(); | |||
| WxCUser user = getUser(); | |||
| if (!StringUtils.isBlank(user.getPhone())) { | |||
| if (StringUtils.isNotBlank(user.getPhone())) { | |||
| resultMap.put("phone", user.getPhone()); | |||
| } else { | |||
| if (StringUtils.isBlank(user.getPhone())) { | |||
| logger.warn("用户手机号未授权,跳转到授权手机号页!"); | |||
| return new ResultData(ErrorCode.PHONE_NOT_FOUND.getCode(), "用户手机号未授权,请跳转到授权手机号页!", resultMap); | |||
| } | |||
| if (user.getPhone().contains("*")) { | |||
| logger.warn("用户手机号已加密,跳转到手工输入手机号页!"); | |||
| return new ResultData(ErrorCode.PHONE_IS_ENCRYPTED.getCode(), "用户手机号已加密,手工输入手机号页!", resultMap); | |||
| } | |||
| } | |||
| if (StringUtils.isBlank(user.getPhone())) { | |||
| logger.warn("用户手机号未授权,跳转到授权手机号页!"); | |||
| return new ResultData(ErrorCode.PHONE_NOT_FOUND.getCode(), "用户手机号未授权,请跳转到授权手机号页!", resultMap); | |||
| } | |||
| if (user.getPhone().contains("*")) { | |||
| logger.warn("用户手机号已加密,跳转到手工输入手机号页!"); | |||
| return new ResultData(ErrorCode.PHONE_IS_ENCRYPTED.getCode(), "用户手机号已加密,手工输入手机号页!", resultMap); | |||
| } | |||
| return new ResultData(Result.SUCCESS, "是老用户,已完成所有授权", resultMap); | |||
| return new ResultData(Result.SUCCESS, "是老用户,已完成手机号授权", resultMap); | |||
| } | |||
| @ApiOperation("获取当前用户信息") | |||
| @@ -457,10 +457,9 @@ public class WxUserGrantController extends BaseController { | |||
| @ApiOperation("获取当前用户车牌列表") | |||
| @GetMapping("/carList") | |||
| public ResultData getCarList() { | |||
| WxCUser user = getUser(); | |||
| WxCUserCar userCar = new WxCUserCar(); | |||
| userCar.setTenantId(user.getTenantId()); | |||
| userCar.setCUserId(user.getId()); | |||
| userCar.setTenantId(getTenantId()); | |||
| userCar.setCUserId(getUserId()); | |||
| List<WxCUserCar> list = wxCUserCarService.getList(userCar); | |||
| return new ResultData(Result.SUCCESS,"获取查询成功", list); | |||
| } | |||
| @@ -541,7 +540,7 @@ public class WxUserGrantController extends BaseController { | |||
| public ResultData updateUserInfo(@RequestBody WxCUserBasicInfo wxCUserBasicInfo) { | |||
| if (wxCUserBasicInfo == null) | |||
| return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); | |||
| if (wxCUserBasicInfoService.getById(getUser().getId()) == null) | |||
| if (wxCUserBasicInfoService.getById(getUserId()) == null) | |||
| return new ResultData(ErrorCode.USER_IS_NOT_MEMBER); | |||
| if (wxCUserBasicInfo.getName() != null || | |||
| @@ -553,7 +552,7 @@ public class WxUserGrantController extends BaseController { | |||
| record.setBirthdate(wxCUserBasicInfo.getBirthdate()); | |||
| record.setSex(wxCUserBasicInfo.getSex() ); | |||
| record.setAddress(wxCUserBasicInfo.getAddress()); | |||
| record.setId(getUser().getId()); | |||
| record.setId(getUserId()); | |||
| record.setUpdateDate(new Date()); | |||
| wxCUserBasicInfoService.update(record); | |||
| wxScoreRulesService.addScore(EnumScoreType.COMPLETE_INFO, record); | |||
| @@ -22,10 +22,9 @@ public interface WxCardSpendService { | |||
| * | |||
| * @param record | |||
| * @param order | |||
| * @param user | |||
| * @return | |||
| */ | |||
| ResultData createCardSpend(WxCardSpend record, WxOrder order, WxCouponMerchant couponMerchant, WxCUser user); | |||
| ResultData createCardSpend(WxCardSpend record, WxOrder order, WxCouponMerchant couponMerchant); | |||
| /** | |||
| * 根据实体查询分页列表 | |||
| @@ -45,16 +45,16 @@ public interface WxOrderPressService { | |||
| * 加入砍价 | |||
| * @param order | |||
| * @param coupon | |||
| * @param user | |||
| * @param cUserId | |||
| */ | |||
| void pressCouponJoin(WxOrder order, WxCoupon coupon, WxCUser user); | |||
| void pressCouponJoin(WxOrder order, WxCoupon coupon, Long cUserId); | |||
| /** | |||
| * 检查用户砍价状态 | |||
| * @param order | |||
| * @param user | |||
| * @param cUserId | |||
| */ | |||
| int pressCouponStatus(WxOrder order, WxCUser user); | |||
| int pressCouponStatus(WxOrder order, Long cUserId); | |||
| @@ -53,12 +53,12 @@ public interface WxOrderService { | |||
| /** | |||
| * 商户码-储值卡支付 | |||
| * @param merchant | |||
| * @param cUser | |||
| * @param cUserId | |||
| * @param totalFeeStr | |||
| * @param payment | |||
| * @return 订单id | |||
| */ | |||
| WxOrder saveCardPayOrder(WxMerchant merchant, WxCUser cUser, String totalFeeStr, Integer payment); | |||
| WxOrder saveCardPayOrder(WxMerchant merchant, Long cUserId, String totalFeeStr, Integer payment); | |||
| /** | |||
| * 免费券订单接口 | |||
| @@ -543,8 +543,8 @@ public class WxCUserTagsServiceImpl implements WxCUserTagsService { | |||
| } | |||
| break; | |||
| case ASSIGN_TAGS_TRIGGER_CAR:{ | |||
| WxCUser param = (WxCUser) obj; | |||
| WxCUserBasicInfo user = wxCUserBasicInfoMapper.selectByPrimaryKey(param.getId()); | |||
| Long param = (Long) obj; | |||
| WxCUserBasicInfo user = wxCUserBasicInfoMapper.selectByPrimaryKey(param); | |||
| if (user != null) { | |||
| //车 | |||
| resList = assignTypeId11(user); | |||
| @@ -87,7 +87,7 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { | |||
| @Override | |||
| @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) | |||
| public ResultData createCardSpend(WxCardSpend record, WxOrder order, WxCouponMerchant couponMerchant, WxCUser user) { | |||
| public ResultData createCardSpend(WxCardSpend record, WxOrder order, WxCouponMerchant couponMerchant) { | |||
| Date curDate = new Date(); | |||
| final IdWorker idWorker = IdWorker.get(); | |||
| // 1. get card info | |||
| @@ -111,11 +111,11 @@ public class WxCardSpendServiceImpl implements WxCardSpendService { | |||
| // 3. get pay account | |||
| WxPayAccount payAccount = null; | |||
| WxPayAccount payAccountQ = new WxPayAccount(); | |||
| payAccountQ.setTenantId(user.getTenantId()); | |||
| payAccountQ.setTenantId(record.getTenantId()); | |||
| try { | |||
| payAccount = payAccountMapper.selectOne(payAccountQ); | |||
| } catch (Exception e) { | |||
| logger.error("获取payAccount error: " + user.getTenantId()); | |||
| logger.error("获取payAccount error: " + record.getTenantId()); | |||
| return new ResultData(ErrorCode.DB_FAIL.getCode(), "获取payAccount失败"); | |||
| } | |||
| @@ -62,17 +62,17 @@ public class WxOrderPressServiceImpl implements WxOrderPressService { | |||
| @Override | |||
| public void pressCouponJoin(WxOrder order, WxCoupon coupon, WxCUser user) { | |||
| public void pressCouponJoin(WxOrder order, WxCoupon coupon, Long cUserId) { | |||
| final IdWorker idWorker = IdWorker.get(); | |||
| Date curDate = new Date(); | |||
| // 检查此人是否已参与砍价 | |||
| WxOrderPress orderPressQ = new WxOrderPress(); | |||
| orderPressQ.setTenantId(order.getTenantId()); | |||
| orderPressQ.setOrderId(order.getId()); | |||
| orderPressQ.setUserId(user.getId()); | |||
| orderPressQ.setUserId(cUserId); | |||
| int count = wxOrderPressMapper.selectCount(orderPressQ); | |||
| if(count >= 1) { | |||
| logger.error("用户已参与砍价: " + user.getId()); | |||
| logger.error("用户已参与砍价: " + cUserId); | |||
| throw new MallinkException(ErrorCode.COUPON_PRESS_IS_EXIST); | |||
| } | |||
| @@ -83,7 +83,7 @@ public class WxOrderPressServiceImpl implements WxOrderPressService { | |||
| orderPress.setId(idWorker.nextId()); | |||
| orderPress.setTenantId(order.getTenantId()); | |||
| orderPress.setOrderId(order.getId()); | |||
| orderPress.setUserId(user.getId()); | |||
| orderPress.setUserId(cUserId); | |||
| orderPress.setCreateDate(curDate); | |||
| orderPress.setFirst(EnumOrderPressType.NORMAL.getCode()); | |||
| orderPress.setPressValue(PressUtils.stateLessPressValue(total, left_total, coupon.getPressLimitNum(), order.getPressCurrentNum())); | |||
| @@ -119,15 +119,15 @@ public class WxOrderPressServiceImpl implements WxOrderPressService { | |||
| } | |||
| @Override | |||
| public int pressCouponStatus(WxOrder order, WxCUser user) { | |||
| public int pressCouponStatus(WxOrder order, Long cUserId) { | |||
| // 检查此人是否已参与砍价 | |||
| WxOrderPress orderPressQ = new WxOrderPress(); | |||
| orderPressQ.setTenantId(order.getTenantId()); | |||
| orderPressQ.setOrderId(order.getId()); | |||
| orderPressQ.setUserId(user.getId()); | |||
| orderPressQ.setUserId(cUserId); | |||
| int count = wxOrderPressMapper.selectCount(orderPressQ); | |||
| if(count >= 1) { | |||
| logger.info("用户已参与砍价: " + user.getId()); | |||
| logger.info("用户已参与砍价: " + cUserId); | |||
| return EnumOrderPressStatus.HAD_JOIN.getCode(); | |||
| } | |||
| return EnumOrderPressStatus.NOT_JOIN.getCode(); | |||
| @@ -550,7 +550,7 @@ public class WxOrderServiceImpl implements WxOrderService { | |||
| @Override | |||
| @Transactional(propagation = Propagation.REQUIRED, readOnly = false, rollbackFor = {Exception.class}) | |||
| public WxOrder saveCardPayOrder(WxMerchant merchant, WxCUser cUser, String totalFeeStr, Integer payment) { | |||
| public WxOrder saveCardPayOrder(WxMerchant merchant, Long cUserId, String totalFeeStr, Integer payment) { | |||
| Date curr = new Date(); | |||
| final IdWorker idWorker = IdWorker.get(); | |||
| @@ -566,7 +566,7 @@ public class WxOrderServiceImpl implements WxOrderService { | |||
| record.setOrderNumber(orderNumber); | |||
| record.setType(EnumOrderType.PREPAIDCARD.getCode()); | |||
| record.setProductId(merchant.getId()); | |||
| record.setcUserId(cUser.getId()); | |||
| record.setcUserId(cUserId); | |||
| record.setPaymentType(EnumPayType.PAY_PAYMENT.getCode()); | |||
| record.setPayment(payment); | |||
| record.setOrderStatus(EnumOrderStatus.ORDER_STATUS_PENDING_PAYMENT.getCode()); | |||