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

B端登陆支持H5

release_toaliyun_real
xiaohanzi 5 лет назад
Родитель
Сommit
59e63fa7b3
21 измененных файлов: 154 добавлений и 104 удалений
  1. +19
    -12
      mallinkBApi/src/main/java/com/iformall/controller/BaseController.java
  2. +8
    -8
      mallinkBApi/src/main/java/com/iformall/controller/PosController.java
  3. +1
    -1
      mallinkBApi/src/main/java/com/iformall/controller/PosOrderController.java
  4. +2
    -2
      mallinkBApi/src/main/java/com/iformall/controller/WxCardPayController.java
  5. +1
    -1
      mallinkBApi/src/main/java/com/iformall/controller/WxCouponChannelController.java
  6. +8
    -7
      mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java
  7. +13
    -9
      mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java
  8. +2
    -2
      mallinkBApi/src/main/java/com/iformall/controller/WxCouponSendController.java
  9. +12
    -8
      mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java
  10. +1
    -1
      mallinkBApi/src/main/java/com/iformall/controller/WxDateAmountRecordController.java
  11. +8
    -8
      mallinkBApi/src/main/java/com/iformall/controller/WxInfoController.java
  12. +1
    -1
      mallinkBApi/src/main/java/com/iformall/controller/WxMallController.java
  13. +1
    -1
      mallinkBApi/src/main/java/com/iformall/controller/WxMemController.java
  14. +5
    -1
      mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java
  15. +4
    -4
      mallinkBApi/src/main/java/com/iformall/controller/WxMerchantController.java
  16. +3
    -3
      mallinkBApi/src/main/java/com/iformall/controller/WxMerchantSubsidyController.java
  17. +7
    -7
      mallinkBApi/src/main/java/com/iformall/controller/WxMerchantTradeDailyController.java
  18. +12
    -9
      mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java
  19. +1
    -1
      mallinkBApi/src/main/java/com/iformall/controller/WxRefundOrderController.java
  20. +43
    -18
      mallinkBApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java
  21. +2
    -0
      mallinkService/src/main/java/com/iformall/utils/Constant.java

+ 19
- 12
mallinkBApi/src/main/java/com/iformall/controller/BaseController.java Просмотреть файл

@@ -69,24 +69,31 @@ public class BaseController {
}); });
} }


public Long getBuserId() {
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
Long id = (Long) request.getAttribute(Constant.LOGIN_USER_KEY);


public Long getMerchantBUserId() {
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
Long id = (Long) request.getAttribute(Constant.LOGIN_B_USER_KEY);
return id; return id;
} }

public WxMerchantBUser getUser() {
WxBuser buser = getBuser();
Long userId = buser.getUserId();
WxMerchantBUser user = wxMerchantBUserService.getById(userId);
public WxMerchantBUser getLoginBUser() {
Long userId = getMerchantBUserId();
WxMerchantBUser user = wxMerchantBUserService.getById(userId);
if (user == null) { if (user == null) {
throw new MallinkException(ErrorCode.USER_IS_EMPTY.getCode(),"BUser[id:"+buser.getId()+",userId:"+userId+"]未查询到WxMerchantBUser。请联系管理员或者重新登陆.");
throw new MallinkException(ErrorCode.USER_IS_EMPTY.getCode(),"BUser[id:"+userId+"]未查询到WxMerchantBUser。请联系管理员或者重新登陆.");
} }
return user; return user;
} }

public WxBuser getBuser() {
Long id = getBuserId();
public Long getWxBuserId() {
HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
Long id = (Long) request.getAttribute(Constant.LOGIN_USER_KEY);
return id;
}
public WxBuser getWxBuser() {
Long id = getWxBuserId();
WxBuser user = wxBuserService.getById(id); WxBuser user = wxBuserService.getById(id);
if (user == null) { if (user == null) {
throw new MallinkException(ErrorCode.USER_IS_EMPTY.getCode(),"BUser[id:"+id+"]未查询到记录, 请重新登陆,并完全授权微信个人信息以及手机号授权."); throw new MallinkException(ErrorCode.USER_IS_EMPTY.getCode(),"BUser[id:"+id+"]未查询到记录, 请重新登陆,并完全授权微信个人信息以及手机号授权.");


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

@@ -35,7 +35,7 @@ public class PosController extends BaseController {
@ApiOperation(value = "商户POS用户/B端用户登录检查", notes = "{\"phone\":\"string\", \"password\":\"string(单位:分)\"}") @ApiOperation(value = "商户POS用户/B端用户登录检查", notes = "{\"phone\":\"string\", \"password\":\"string(单位:分)\"}")
@PostMapping("checkUserPassword") @PostMapping("checkUserPassword")
public ResultData checkUserPassword(@RequestBody Map<String, String> params) { public ResultData checkUserPassword(@RequestBody Map<String, String> params) {
WxMerchantBUser user = getUser();
WxMerchantBUser user = getLoginBUser();
String phone = params.get("phone"); String phone = params.get("phone");
String password = params.get("password"); String password = params.get("password");
//登录凭证不能为空 //登录凭证不能为空
@@ -51,7 +51,7 @@ public class PosController extends BaseController {
@ApiOperation(value = "券独立核销-1-检查", notes = "{\"couponOrderId\":\"string\"}") @ApiOperation(value = "券独立核销-1-检查", notes = "{\"couponOrderId\":\"string\"}")
@PostMapping("checkCouponOrderForIndepentVerify") @PostMapping("checkCouponOrderForIndepentVerify")
public ResultData checkCouponOrderForIndepentVerify(@RequestBody Map<String, String> params) { public ResultData checkCouponOrderForIndepentVerify(@RequestBody Map<String, String> params) {
WxMerchantBUser user = getUser();
WxMerchantBUser user = getLoginBUser();
String couponOrderIdStr = params.get(WxPayConstant.COUPON_ORDER_ID); // 券包ID String couponOrderIdStr = params.get(WxPayConstant.COUPON_ORDER_ID); // 券包ID


if (StringUtils.isBlank(couponOrderIdStr)) { if (StringUtils.isBlank(couponOrderIdStr)) {
@@ -64,7 +64,7 @@ public class PosController extends BaseController {
@ApiOperation(value = "券独立核销-2-核销", notes = "{\"couponOrderId\":\"string\", \"payment\":\"string(单位:分)\"}") @ApiOperation(value = "券独立核销-2-核销", notes = "{\"couponOrderId\":\"string\", \"payment\":\"string(单位:分)\"}")
@PostMapping("posVerifyIndepent") @PostMapping("posVerifyIndepent")
public ResultData posVerifyIndepent(@RequestBody Map<String, String> params) { public ResultData posVerifyIndepent(@RequestBody Map<String, String> params) {
WxMerchantBUser user = getUser();
WxMerchantBUser user = getLoginBUser();
String couponOrderId = params.get("coupon_order_id"); String couponOrderId = params.get("coupon_order_id");
String payment = params.get("payment"); String payment = params.get("payment");
if (StringUtils.isBlank(couponOrderId)) { if (StringUtils.isBlank(couponOrderId)) {
@@ -78,7 +78,7 @@ public class PosController extends BaseController {
@ApiOperation(value = "会员支付-1-会员识别", notes = "{\"mem_id\":\"string(可选)\",\"mem_phone\":\"string(可选)\",\"pos_order_id\":\"string(必填)\",\"pos_amount\":\"string(单位:分)(必填)\"}") @ApiOperation(value = "会员支付-1-会员识别", notes = "{\"mem_id\":\"string(可选)\",\"mem_phone\":\"string(可选)\",\"pos_order_id\":\"string(必填)\",\"pos_amount\":\"string(单位:分)(必填)\"}")
@PostMapping("checkMem") @PostMapping("checkMem")
public ResultData checkMem(@RequestBody Map<String, String> params) { public ResultData checkMem(@RequestBody Map<String, String> params) {
WxMerchantBUser user = getUser();
WxMerchantBUser user = getLoginBUser();
String memIdStr = params.get(WxPayConstant.MEM_ID); // 会员ID String memIdStr = params.get(WxPayConstant.MEM_ID); // 会员ID
String memPhoneStr = params.get(WxPayConstant.MEM_PHONE); // 会员手机 String memPhoneStr = params.get(WxPayConstant.MEM_PHONE); // 会员手机
String posOrderIdStr = params.get(WxPayConstant.POS_ORDER_ID); // POS订单ID String posOrderIdStr = params.get(WxPayConstant.POS_ORDER_ID); // POS订单ID
@@ -102,7 +102,7 @@ public class PosController extends BaseController {
@ApiOperation(value = "会员支付-2-交易核销检查", notes = "{\"coupon_order_id\":\"string(必填)\",\"pos_order_id\":\"string(必填)\",\"pos_amount\":\"string(必填)\"}") @ApiOperation(value = "会员支付-2-交易核销检查", notes = "{\"coupon_order_id\":\"string(必填)\",\"pos_order_id\":\"string(必填)\",\"pos_amount\":\"string(必填)\"}")
@PostMapping("checkCouponOrderForPayVerify") @PostMapping("checkCouponOrderForPayVerify")
public ResultData checkCouponOrderForPayVerify(@RequestBody Map<String, String> params) { public ResultData checkCouponOrderForPayVerify(@RequestBody Map<String, String> params) {
WxMerchantBUser user = getUser();
WxMerchantBUser user = getLoginBUser();
String couponOrderIdStr = params.get(WxPayConstant.COUPON_ORDER_ID); // 券包ID String couponOrderIdStr = params.get(WxPayConstant.COUPON_ORDER_ID); // 券包ID
String posOrderIdStr = params.get(WxPayConstant.POS_ORDER_ID); // POS订单ID String posOrderIdStr = params.get(WxPayConstant.POS_ORDER_ID); // POS订单ID
String posAmountStr = params.get(WxPayConstant.ORDER_AMOUNT); // POS订单金额 String posAmountStr = params.get(WxPayConstant.ORDER_AMOUNT); // POS订单金额
@@ -123,7 +123,7 @@ public class PosController extends BaseController {
@ApiOperation(value = "会员支付-3-券预核销", notes = "{\"coupon_order_id\":\"string(必填)\",\"deduct_amount\":\"string(必填)\",\"pos_order_id\":\"string(必填)\",\"pos_amount\":\"string(必填)\"}") @ApiOperation(value = "会员支付-3-券预核销", notes = "{\"coupon_order_id\":\"string(必填)\",\"deduct_amount\":\"string(必填)\",\"pos_order_id\":\"string(必填)\",\"pos_amount\":\"string(必填)\"}")
@PostMapping("couponOrderPreVerify") @PostMapping("couponOrderPreVerify")
public ResultData couponOrderPreVerify(@RequestBody Map<String, String> params) { public ResultData couponOrderPreVerify(@RequestBody Map<String, String> params) {
WxMerchantBUser user = getUser();
WxMerchantBUser user = getLoginBUser();
String couponOrderIdStr = params.get(WxPayConstant.COUPON_ORDER_ID); // 券包ID String couponOrderIdStr = params.get(WxPayConstant.COUPON_ORDER_ID); // 券包ID
String deductAmountStr = params.get(WxPayConstant.DEDUCT_AMOUNT); // 扣减金额 String deductAmountStr = params.get(WxPayConstant.DEDUCT_AMOUNT); // 扣减金额
String posOrderIdStr = params.get(WxPayConstant.POS_ORDER_ID); // POS订单ID String posOrderIdStr = params.get(WxPayConstant.POS_ORDER_ID); // POS订单ID
@@ -148,7 +148,7 @@ public class PosController extends BaseController {
@ApiOperation(value = "会员支付-4-支付完成", notes = "{\"pos_order_id\":\"string\"}") @ApiOperation(value = "会员支付-4-支付完成", notes = "{\"pos_order_id\":\"string\"}")
@PostMapping("posOrderFinished") @PostMapping("posOrderFinished")
public ResultData posOrderFinished(@RequestBody Map<String, String> params) { public ResultData posOrderFinished(@RequestBody Map<String, String> params) {
WxMerchantBUser user = getUser();
WxMerchantBUser user = getLoginBUser();
String posOrderIdStr = params.get(WxPayConstant.POS_ORDER_ID); // POS订单ID String posOrderIdStr = params.get(WxPayConstant.POS_ORDER_ID); // POS订单ID
if (StringUtils.isBlank(posOrderIdStr)) { if (StringUtils.isBlank(posOrderIdStr)) {
return errParam(WxPayConstant.POS_ORDER_ID); return errParam(WxPayConstant.POS_ORDER_ID);
@@ -163,7 +163,7 @@ public class PosController extends BaseController {
@ApiOperation(value = "会员支付-10-券预核销取消", notes = "{\"coupon_order_id\":\"string(必填)\",\"pos_order_id\":\"string(必填)\",\"pos_amount\":\"string(必填)\"}") @ApiOperation(value = "会员支付-10-券预核销取消", notes = "{\"coupon_order_id\":\"string(必填)\",\"pos_order_id\":\"string(必填)\",\"pos_amount\":\"string(必填)\"}")
@PostMapping("couponOrderPreVerifyCancel") @PostMapping("couponOrderPreVerifyCancel")
public ResultData couponOrderPreVerifyCancel(@RequestBody Map<String, String> params) { public ResultData couponOrderPreVerifyCancel(@RequestBody Map<String, String> params) {
WxMerchantBUser user = getUser();
WxMerchantBUser user = getLoginBUser();
String couponOrderIdStr = params.get(WxPayConstant.COUPON_ORDER_ID); // 券包ID String couponOrderIdStr = params.get(WxPayConstant.COUPON_ORDER_ID); // 券包ID
String posOrderIdStr = params.get(WxPayConstant.POS_ORDER_ID); // POS订单ID String posOrderIdStr = params.get(WxPayConstant.POS_ORDER_ID); // POS订单ID
String posAmountStr = params.get(WxPayConstant.ORDER_AMOUNT); // POS订单金额(单位:分) String posAmountStr = params.get(WxPayConstant.ORDER_AMOUNT); // POS订单金额(单位:分)


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

@@ -43,7 +43,7 @@ public class PosOrderController extends BaseController {
@ApiOperation(value = "新增POS订单接口", notes = "") @ApiOperation(value = "新增POS订单接口", notes = "")
@PostMapping("addForPosPay") @PostMapping("addForPosPay")
public ResultData add(@RequestBody PosOrder posOrder) { public ResultData add(@RequestBody PosOrder posOrder) {
WxMerchantBUser user = getUser();
WxMerchantBUser user = getLoginBUser();
if (posOrder == null) { if (posOrder == null) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL);
} }


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

@@ -47,7 +47,7 @@ public class WxCardPayController extends BaseController {
String ipStr = getIpAddr(); String ipStr = getIpAddr();
logger.info("cardSpendlist: " + ipStr + " :" + wxCardSpendVo.toString()); logger.info("cardSpendlist: " + ipStr + " :" + wxCardSpendVo.toString());
if (wxCardSpendVo == null) wxCardSpendVo = new WxCardSpendVo(); if (wxCardSpendVo == null) wxCardSpendVo = new WxCardSpendVo();
WxMerchantBUser user = getUser();
WxMerchantBUser user = getLoginBUser();
wxCardSpendVo.updateTenantInfo(user); wxCardSpendVo.updateTenantInfo(user);
wxCardSpendVo.setMerchantId(user.getMerchantId()); wxCardSpendVo.setMerchantId(user.getMerchantId());
final PageInfo<WxCardSpendVo> page = wxCardSpendService.listAsPage(wxCardSpendVo, pageNum, pageSize); final PageInfo<WxCardSpendVo> page = wxCardSpendService.listAsPage(wxCardSpendVo, pageNum, pageSize);
@@ -60,7 +60,7 @@ public class WxCardPayController extends BaseController {
String ipStr = getIpAddr(); String ipStr = getIpAddr();
logger.info("sumCardSpendList: " + ipStr + " :" + wxCardSpend.toString()); logger.info("sumCardSpendList: " + ipStr + " :" + wxCardSpend.toString());
if (wxCardSpend == null) wxCardSpend = new WxCardSpendVo(); if (wxCardSpend == null) wxCardSpend = new WxCardSpendVo();
WxMerchantBUser user = getUser();
WxMerchantBUser user = getLoginBUser();
wxCardSpend.updateTenantInfo(user); wxCardSpend.updateTenantInfo(user);
wxCardSpend.setMerchantId(user.getMerchantId()); wxCardSpend.setMerchantId(user.getMerchantId());
final List<Map<String, Object>> mapList = wxCardSpendService.sumCardSpendForMerchant(wxCardSpend); final List<Map<String, Object>> mapList = wxCardSpendService.sumCardSpendForMerchant(wxCardSpend);


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

@@ -58,7 +58,7 @@ public class WxCouponChannelController extends BaseController {
if (wxCouponChannel.getStatus() != null && wxCouponChannel.getStatus() == -1) { if (wxCouponChannel.getStatus() != null && wxCouponChannel.getStatus() == -1) {
wxCouponChannel.setStatus(null); wxCouponChannel.setStatus(null);
} }
wxCouponChannel.setMerchantId(getUser().getMerchantId());
wxCouponChannel.setMerchantId(getLoginBUser().getMerchantId());
wxCouponChannel.updateTenantInfo(getTenantInfo()); wxCouponChannel.updateTenantInfo(getTenantInfo());
wxCouponChannel.setSortColumns(BaseEntity.SortField.CCUpdateDate_DESC); wxCouponChannel.setSortColumns(BaseEntity.SortField.CCUpdateDate_DESC);




+ 8
- 7
mallinkBApi/src/main/java/com/iformall/controller/WxCouponController.java Просмотреть файл

@@ -69,7 +69,7 @@ public class WxCouponController extends BaseController {
if(null == wxCoupon.getSourceType()){ if(null == wxCoupon.getSourceType()){
wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Bapi.getCode()); wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Bapi.getCode());
} }
wxCoupon.setMerchantId(getUser().getMerchantId());
wxCoupon.setMerchantId(getLoginBUser().getMerchantId());


if(StringUtils.isNotBlank(wxCoupon.getSortColumn())){ if(StringUtils.isNotBlank(wxCoupon.getSortColumn())){
wxCoupon.setSortColumn("c."+wxCoupon.getSortColumn()); wxCoupon.setSortColumn("c."+wxCoupon.getSortColumn());
@@ -97,7 +97,7 @@ public class WxCouponController extends BaseController {
EnumCouponType.COUPON_PRESS.getCode()}; EnumCouponType.COUPON_PRESS.getCode()};


wxCoupon.setTypes(Arrays.asList(typeArray)); wxCoupon.setTypes(Arrays.asList(typeArray));
wxCoupon.setMerchantId(getUser().getMerchantId());
wxCoupon.setMerchantId(getLoginBUser().getMerchantId());
if(StringUtils.isNotBlank(wxCoupon.getSortColumn())){ if(StringUtils.isNotBlank(wxCoupon.getSortColumn())){
wxCoupon.setSortColumn("c."+wxCoupon.getSortColumn()); wxCoupon.setSortColumn("c."+wxCoupon.getSortColumn());
} }
@@ -173,8 +173,8 @@ public class WxCouponController extends BaseController {
if (!hasMerchantCouponFlow()) { if (!hasMerchantCouponFlow()) {
return new ResultData(Result.ERROR,EnumFlowKey.B_COUPON_MERCHANT_CREATE.getMessage()+"未配置审批流程"); return new ResultData(Result.ERROR,EnumFlowKey.B_COUPON_MERCHANT_CREATE.getMessage()+"未配置审批流程");
} }
WxMerchantBUser buser = getUser();
wxFlowService.start(generateFlowParams(EnumFlowKey.B_COUPON_MERCHANT_CREATE,EnumCouponAppType.PUT,coupon,wxCoupon.getRemark(), buser.getPhone()), getBuserId(), buser.getName(), coupon);
WxMerchantBUser buser = getLoginBUser();
wxFlowService.start(generateFlowParams(EnumFlowKey.B_COUPON_MERCHANT_CREATE,EnumCouponAppType.PUT,coupon,wxCoupon.getRemark(), buser.getPhone()), buser.getId(), buser.getName(), coupon);
return new ResultData(Result.SUCCESS,"提交审批成功"); return new ResultData(Result.SUCCESS,"提交审批成功");
} }
@@ -194,7 +194,7 @@ public class WxCouponController extends BaseController {
wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Bapi.getCode()); wxCoupon.setSourceType(EnumCouponSourceType.COUPONSource_Bapi.getCode());
} }
List<WxMerchant> merchantList = new ArrayList<>(); List<WxMerchant> merchantList = new ArrayList<>();
WxMerchant wxMerchant = wxMerchantService.getById(getUser().getMerchantId());
WxMerchant wxMerchant = wxMerchantService.getById(getLoginBUser().getMerchantId());
merchantList.add(wxMerchant); merchantList.add(wxMerchant);


wxCoupon.setMerchantParams(JSONObject.toJSONString(merchantList)); wxCoupon.setMerchantParams(JSONObject.toJSONString(merchantList));
@@ -205,9 +205,10 @@ public class WxCouponController extends BaseController {
} }
redisLock.setCouponStock(wxCoupon.getId(), wxCoupon.getRemainInventory()); redisLock.setCouponStock(wxCoupon.getId(), wxCoupon.getRemainInventory());
//启动投放审批 //启动投放审批
WxMerchantBUser buser = getLoginBUser();
if(wxCoupon.getFlowParams() !=null && wxCoupon.getFlowParams().size()>0) { if(wxCoupon.getFlowParams() !=null && wxCoupon.getFlowParams().size()>0) {
wxCoupon.getFlowParams().put("businessId",wxCoupon.getId()); wxCoupon.getFlowParams().put("businessId",wxCoupon.getId());
wxFlowService.start(wxCoupon.getFlowParams(), getBuserId(), getUser().getName(), tenantEntity);
wxFlowService.start(wxCoupon.getFlowParams(), buser.getId(), buser.getName(), tenantEntity);
//修改coupon applyStatus状态为审核中 //修改coupon applyStatus状态为审核中
wxCoupon.setPutApplyStatus(EnumRentContractAppStatus.APPLYING.getCode()); wxCoupon.setPutApplyStatus(EnumRentContractAppStatus.APPLYING.getCode());
} }
@@ -236,7 +237,7 @@ public class WxCouponController extends BaseController {
} }


List<WxMerchant> merchantList = new ArrayList<>(); List<WxMerchant> merchantList = new ArrayList<>();
WxMerchant wxMerchant = wxMerchantService.getById(getUser().getMerchantId());
WxMerchant wxMerchant = wxMerchantService.getById(getLoginBUser().getMerchantId());
merchantList.add(wxMerchant); merchantList.add(wxMerchant);


wxCoupon.setMerchantParams(JSONObject.toJSONString(merchantList)); wxCoupon.setMerchantParams(JSONObject.toJSONString(merchantList));


+ 13
- 9
mallinkBApi/src/main/java/com/iformall/controller/WxCouponOrderController.java Просмотреть файл

@@ -83,7 +83,7 @@ public class WxCouponOrderController 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 listUnverified(String date, Integer pageNum, Integer pageSize) { public ResultData listUnverified(String date, Integer pageNum, Integer pageSize) {
return wxCouponOrderService.listOnDateAsPage(getUser().getId(), date, pageNum, pageSize, false);
return wxCouponOrderService.listOnDateAsPage(getLoginBUser().getId(), date, pageNum, pageSize, false);
} }


@ApiOperation("核销流水分页列表接口") @ApiOperation("核销流水分页列表接口")
@@ -93,7 +93,7 @@ public class WxCouponOrderController 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 listVerified(String date, Integer pageNum, Integer pageSize) { public ResultData listVerified(String date, Integer pageNum, Integer pageSize) {
return wxCouponOrderService.listOnDateAsPage(getUser().getId(), date, pageNum, pageSize, true);
return wxCouponOrderService.listOnDateAsPage(getLoginBUser().getId(), date, pageNum, pageSize, true);
} }




@@ -103,7 +103,7 @@ public class WxCouponOrderController extends BaseController {
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = "date", value = "日期yyyy-MM-dd", dataType = "string", paramType = "query")}) @ApiImplicitParam(name = "date", value = "日期yyyy-MM-dd", dataType = "string", paramType = "query")})
public ResultData getUnverifiedAmountOnDate(String date) { public ResultData getUnverifiedAmountOnDate(String date) {
return wxCouponOrderService.listOnDateAsPage(getUser().getId(), date, null, null, false);
return wxCouponOrderService.listOnDateAsPage(getLoginBUser().getId(), date, null, null, false);
} }


@RedisCache @RedisCache
@@ -112,7 +112,7 @@ public class WxCouponOrderController extends BaseController {
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = "date", value = "日期yyyy-MM-dd", dataType = "string", paramType = "query")}) @ApiImplicitParam(name = "date", value = "日期yyyy-MM-dd", dataType = "string", paramType = "query")})
public ResultData getVerifiedAmountOnDate(String date) { public ResultData getVerifiedAmountOnDate(String date) {
return wxCouponOrderService.listOnDateAsPage(getUser().getId(), date, null, null, true);
return wxCouponOrderService.listOnDateAsPage(getLoginBUser().getId(), date, null, null, true);
} }




@@ -125,8 +125,8 @@ public class WxCouponOrderController extends BaseController {
if (couponOrderId == null) { if (couponOrderId == null) {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL);
} }
Long bUserId = getUser().getId();
WxMerchantBUser wxMerchantBUser = wxMerchantBUserService.getById(getUser().getId());
Long bUserId = getLoginBUser().getId();
WxMerchantBUser wxMerchantBUser = wxMerchantBUserService.getById(getLoginBUser().getId());
if (wxMerchantBUser == null) { if (wxMerchantBUser == null) {
logger.error("用户不存在:" + bUserId); logger.error("用户不存在:" + bUserId);
throw new MallinkException(ErrorCode.USER_IS_EMPTY); throw new MallinkException(ErrorCode.USER_IS_EMPTY);
@@ -279,12 +279,16 @@ public class WxCouponOrderController extends BaseController {
return new ResultData(ErrorCode.COUPON_ORDER_IS_NULL); return new ResultData(ErrorCode.COUPON_ORDER_IS_NULL);
} }


WxMerchantBUser wxMerchantBUser = wxMerchantBUserService.getById(getUser().getId());
WxMerchantBUser wxMerchantBUser = wxMerchantBUserService.getById(getLoginBUser().getId());
if (wxMerchantBUser == null) { if (wxMerchantBUser == null) {
logger.error("核销员ID不存在:" + getUser().getId());
logger.error("核销员ID不存在:" + getLoginBUser().getId());
throw new MallinkException(ErrorCode.USER_IS_EMPTY.getCode(), "核销员ID不存在或者无权限"); throw new MallinkException(ErrorCode.USER_IS_EMPTY.getCode(), "核销员ID不存在或者无权限");
} }
wxMerchantBUser.setBuserId(getBuserId());
Long bUserId = getWxBuserId();
if (null != bUserId) {
wxMerchantBUser.setBuserId(bUserId);
}
WxCouponOrder couponOrder = null; WxCouponOrder couponOrder = null;
try { try {
couponOrder = wxCouponOrderService.verify(wxCouponOrder, wxMerchantBUser); couponOrder = wxCouponOrderService.verify(wxCouponOrder, wxMerchantBUser);


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

@@ -56,7 +56,7 @@ public class WxCouponSendController extends BaseController {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL);
} }
wxCouponSend.updateTenantInfo(getTenantInfo()); wxCouponSend.updateTenantInfo(getTenantInfo());
wxCouponSend.setMerchantId(getUser().getMerchantId());
wxCouponSend.setMerchantId(getLoginBUser().getMerchantId());
if (Objects.nonNull(wxCouponSend.getExpired()) && Objects.equals(wxCouponSend.getExpired(), 0)) { if (Objects.nonNull(wxCouponSend.getExpired()) && Objects.equals(wxCouponSend.getExpired(), 0)) {
wxCouponSend.setMerchantRemain(0); wxCouponSend.setMerchantRemain(0);
} }
@@ -143,7 +143,7 @@ public class WxCouponSendController extends BaseController {
params.put("parentTenantId", tenantEntity.getParentTenantId()); params.put("parentTenantId", tenantEntity.getParentTenantId());
} }
params.put("channelType", channelType); params.put("channelType", channelType);
params.put("merchantId", getUser().getMerchantId());
params.put("merchantId", getLoginBUser().getMerchantId());
PageInfo<WxCouponActionLogVo> data = wxCouponActionLogService.getActionLog(params, pageNum, pageSize); PageInfo<WxCouponActionLogVo> data = wxCouponActionLogService.getActionLog(params, pageNum, pageSize);
return new ResultData(data); return new ResultData(data);
} }


+ 12
- 8
mallinkBApi/src/main/java/com/iformall/controller/WxCreditHistoryController.java Просмотреть файл

@@ -4,6 +4,7 @@ import com.github.pagehelper.PageInfo;
import com.iformall.common.ErrorCode; import com.iformall.common.ErrorCode;
import com.iformall.common.Result; import com.iformall.common.Result;
import com.iformall.common.ResultData; import com.iformall.common.ResultData;
import com.iformall.domain.po.WxBuser;
import com.iformall.domain.po.WxCUserBasicInfo; import com.iformall.domain.po.WxCUserBasicInfo;
import com.iformall.domain.po.WxCreditHistory; import com.iformall.domain.po.WxCreditHistory;
import com.iformall.domain.po.WxMerchant; import com.iformall.domain.po.WxMerchant;
@@ -60,10 +61,10 @@ public class WxCreditHistoryController extends BaseController {
log.debug("[" + getIpAddr() + "] WxCreditHistoryController::findByMerchantIdAndSpend"); log.debug("[" + getIpAddr() + "] WxCreditHistoryController::findByMerchantIdAndSpend");
WxMerchant wxMerchant = new WxMerchant(); WxMerchant wxMerchant = new WxMerchant();
wxMerchant.setStatus(EnumYesOrNo.YES.getCode()); wxMerchant.setStatus(EnumYesOrNo.YES.getCode());
wxMerchant.setId(getUser().getMerchantId());
wxMerchant.setId(getLoginBUser().getMerchantId());
wxMerchant = wxMerchantService.findOne(wxMerchant); wxMerchant = wxMerchantService.findOne(wxMerchant);
//普通商户只允许查询自己的消费金额所增加的积分 //普通商户只允许查询自己的消费金额所增加的积分
if (wxMerchant.getIsAdmin() != EnumYesOrNo.YES.getCode() && merchantId.longValue() != getUser().getMerchantId().longValue()) {
if (wxMerchant.getIsAdmin() != EnumYesOrNo.YES.getCode() && merchantId.longValue() != getLoginBUser().getMerchantId().longValue()) {
return new ResultData(ErrorCode.USER_NO_PERMISSION); return new ResultData(ErrorCode.USER_NO_PERMISSION);
} }
if(Objects.isNull(merchantId)|| StringUtils.isEmpty(spendStr)||Objects.isNull(userId)) { if(Objects.isNull(merchantId)|| StringUtils.isEmpty(spendStr)||Objects.isNull(userId)) {
@@ -99,28 +100,31 @@ public class WxCreditHistoryController extends BaseController {
public ResultData add(@RequestBody WxCreditHistory wxCreditHistory) { public ResultData add(@RequestBody WxCreditHistory wxCreditHistory) {
log.debug("[" + getIpAddr() + "] WxCreditHistoryController::add"); log.debug("[" + getIpAddr() + "] WxCreditHistoryController::add");
wxCreditHistory.updateTenantInfo(getTenantInfo()); wxCreditHistory.updateTenantInfo(getTenantInfo());
wxCreditHistory.setOperatorId(getUser().getId());
wxCreditHistory.setOperatorId(getLoginBUser().getId());
WxMerchant wxMerchant = new WxMerchant(); WxMerchant wxMerchant = new WxMerchant();
wxMerchant.setId(getUser().getMerchantId());
wxMerchant.setId(getLoginBUser().getMerchantId());
wxMerchant.setStatus(EnumMerchantStatus.VALID.getCode()); wxMerchant.setStatus(EnumMerchantStatus.VALID.getCode());
WxMerchant merchant = wxMerchantService.findOne(wxMerchant); WxMerchant merchant = wxMerchantService.findOne(wxMerchant);
//消费积分:取当前人的商户ID //消费积分:取当前人的商户ID
if (wxCreditHistory.getCreditType() == EnumScoreType.REDUCE_CREDIT.getCode()) { if (wxCreditHistory.getCreditType() == EnumScoreType.REDUCE_CREDIT.getCode()) {
wxCreditHistory.setMerchantId(getUser().getMerchantId());
wxCreditHistory.setMerchantId(getLoginBUser().getMerchantId());
} else { } else {
//新增积分: //新增积分:
//如果为商管商户 则消费商户按前端传入的进行记录 //如果为商管商户 则消费商户按前端传入的进行记录
if (merchant != null && merchant.getIsAdmin() != null && merchant.getIsAdmin() == 1) { if (merchant != null && merchant.getIsAdmin() != null && merchant.getIsAdmin() == 1) {
wxCreditHistory.setMerchantId(wxCreditHistory.getMerchantId()); wxCreditHistory.setMerchantId(wxCreditHistory.getMerchantId());
} else { } else {
wxCreditHistory.setMerchantId(getUser().getMerchantId());
wxCreditHistory.setMerchantId(getLoginBUser().getMerchantId());
} }
} }
//B端操作用户 //B端操作用户
wxCreditHistory.setOperatorType(EnumUserType.BUSER.getCode()); wxCreditHistory.setOperatorType(EnumUserType.BUSER.getCode());
try { try {
wxCreditHistoryService.creditUsercheck(wxCreditHistory.getCUserId(),wxCreditHistory); wxCreditHistoryService.creditUsercheck(wxCreditHistory.getCUserId(),wxCreditHistory);
wxCreditHistory.setBuserId(getBuser().getId());
WxBuser buser = getWxBuser();
if (null != buser) {
wxCreditHistory.setBuserId(buser.getId());
}
WxCreditHistory credit = wxCreditHistoryService.saveOrUpdate(wxCreditHistory); WxCreditHistory credit = wxCreditHistoryService.saveOrUpdate(wxCreditHistory);
//更新标签 //更新标签
if (wxCreditHistory.getTags() != null && !wxCreditHistory.getTags().isEmpty()) { if (wxCreditHistory.getTags() != null && !wxCreditHistory.getTags().isEmpty()) {
@@ -141,7 +145,7 @@ public class WxCreditHistoryController extends BaseController {
public ResultData list(@ModelAttribute WxCreditHistory wxCreditHistory, Integer pageNum, Integer pageSize) { public ResultData list(@ModelAttribute WxCreditHistory wxCreditHistory, Integer pageNum, Integer pageSize) {
log.debug("[" + getIpAddr() + "] WxCreditHistoryController::list"); log.debug("[" + getIpAddr() + "] WxCreditHistoryController::list");
if (null == wxCreditHistory) wxCreditHistory = new WxCreditHistory(); if (null == wxCreditHistory) wxCreditHistory = new WxCreditHistory();
WxMerchantBUser bUser = getUser();
WxMerchantBUser bUser = getLoginBUser();
WxMerchant merchant = wxMerchantService.getById(wxCreditHistory.getMerchantId()); WxMerchant merchant = wxMerchantService.getById(wxCreditHistory.getMerchantId());
if (merchant != null && merchant.getIsAdmin() != null && merchant.getIsAdmin() == 1) { if (merchant != null && merchant.getIsAdmin() != null && merchant.getIsAdmin() == 1) {
wxCreditHistory.setOperatorId(bUser.getId()); wxCreditHistory.setOperatorId(bUser.getId());


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

@@ -58,7 +58,7 @@ public class WxDateAmountRecordController extends BaseController {
List<AmountRecordVo> list = new ArrayList<>(); List<AmountRecordVo> list = new ArrayList<>();


WxDateAmountRecord temp = new WxDateAmountRecord(); WxDateAmountRecord temp = new WxDateAmountRecord();
WxMerchantBUser u = getUser();
WxMerchantBUser u = getLoginBUser();
temp.updateTenantInfo(u); temp.updateTenantInfo(u);
temp.setMerchantId(u.getMerchantId()); temp.setMerchantId(u.getMerchantId());
temp.setType(dateAmtType); temp.setType(dateAmtType);


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

@@ -426,7 +426,7 @@ public class WxInfoController extends BaseController {
} }


WxMaService wxMaService = getWeappService(appId); WxMaService wxMaService = getWeappService(appId);
WxBuser buser = getBuser();
WxBuser buser = getWxBuser();
try { try {
// 解密 // 解密
WxMaPhoneNumberInfo phoneNoInfo = wxMaService.getUserService().getPhoneNoInfo(session_key, encryptedData, iv); WxMaPhoneNumberInfo phoneNoInfo = wxMaService.getUserService().getPhoneNoInfo(session_key, encryptedData, iv);
@@ -458,7 +458,7 @@ public class WxInfoController extends BaseController {
@ApiOperation(value = "判断用户是否完成授权", notes = "") @ApiOperation(value = "判断用户是否完成授权", notes = "")
public ResultData checkWechatStatus() { public ResultData checkWechatStatus() {
Map resultMap = new HashMap(); Map resultMap = new HashMap();
WxBuser user = getBuser();
WxBuser user = getWxBuser();
if (StringUtils.isNotBlank(user.getNickName())) { if (StringUtils.isNotBlank(user.getNickName())) {
resultMap.put("nickName", user.getNickName()); resultMap.put("nickName", user.getNickName());
} else { } else {
@@ -489,7 +489,7 @@ public class WxInfoController extends BaseController {
@ApiOperation(value = "判断用户是否完成昵称授权", notes = "") @ApiOperation(value = "判断用户是否完成昵称授权", notes = "")
public ResultData checkUserStatus() { public ResultData checkUserStatus() {
Map resultMap = new HashMap(); Map resultMap = new HashMap();
WxBuser user = getBuser();
WxBuser user = getWxBuser();
if (StringUtils.isNotBlank(user.getNickName())) { if (StringUtils.isNotBlank(user.getNickName())) {
resultMap.put("nickName", user.getNickName()); resultMap.put("nickName", user.getNickName());
} else { } else {
@@ -508,7 +508,7 @@ public class WxInfoController extends BaseController {
@ApiOperation(value = "判断用户是否完成手机授权", notes = "") @ApiOperation(value = "判断用户是否完成手机授权", notes = "")
public ResultData checkPhoneStatus() { public ResultData checkPhoneStatus() {
Map resultMap = new HashMap(); Map resultMap = new HashMap();
WxBuser user = getBuser();
WxBuser user = getWxBuser();
if (StringUtils.isNotBlank(user.getPhone())) { if (StringUtils.isNotBlank(user.getPhone())) {
resultMap.put("phone", user.getPhone()); resultMap.put("phone", user.getPhone());
} else { } else {
@@ -546,7 +546,7 @@ public class WxInfoController extends BaseController {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "iv不能为空"); return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "iv不能为空");
} }


WxBuser user = getBuser();
WxBuser user = getWxBuser();


if (user != null) { if (user != null) {
logger.debug(user.toString()); logger.debug(user.toString());
@@ -588,7 +588,7 @@ public class WxInfoController extends BaseController {


String systemInfo = map.get("systemInfo"); String systemInfo = map.get("systemInfo");


WxBuser user = getBuser();
WxBuser user = getWxBuser();
if (StringUtils.isNotBlank(systemInfo)) { if (StringUtils.isNotBlank(systemInfo)) {
JSONObject extraInfo = new JSONObject(); JSONObject extraInfo = new JSONObject();
extraInfo.put("systemInfo", JSONObject.parseObject(systemInfo)); extraInfo.put("systemInfo", JSONObject.parseObject(systemInfo));
@@ -606,7 +606,7 @@ public class WxInfoController extends BaseController {
String longitude = map.get("longitude"); String longitude = map.get("longitude");
String latitude = map.get("latitude"); String latitude = map.get("latitude");


WxBuser user = getBuser();
WxBuser user = getWxBuser();
if (!StringUtils.isBlank(longitude)) { if (!StringUtils.isBlank(longitude)) {
user.setLongitude(BigDecimal.valueOf(Double.valueOf(longitude))); user.setLongitude(BigDecimal.valueOf(Double.valueOf(longitude)));
} }
@@ -624,7 +624,7 @@ public class WxInfoController extends BaseController {


String scene = map.get("scene"); String scene = map.get("scene");


WxBuser user = getBuser();
WxBuser user = getWxBuser();
if (StringUtils.isBlank(user.getScene())) { if (StringUtils.isBlank(user.getScene())) {
if (StringUtils.isNotBlank(scene)) { if (StringUtils.isNotBlank(scene)) {
user.setScene(scene); user.setScene(scene);


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

@@ -70,7 +70,7 @@ public class WxMallController extends BaseController {
@GetMapping("/mallInfo") @GetMapping("/mallInfo")
@ApiImplicitParam(name = "appId", value = "appId", dataType = "String", paramType = "query", required = true) @ApiImplicitParam(name = "appId", value = "appId", dataType = "String", paramType = "query", required = true)
public ResultData getMallInfo(String appId) { public ResultData getMallInfo(String appId) {
WxMerchantBUser buUser = getUser();
WxMerchantBUser buUser = getLoginBUser();
WxMall mall = wxMallService.getByTenantInfo(buUser); WxMall mall = wxMallService.getByTenantInfo(buUser);
if (mall == null) { if (mall == null) {
return new ResultData(ErrorCode.MALL_INFO_NOT_FOUND); return new ResultData(ErrorCode.MALL_INFO_NOT_FOUND);


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

@@ -65,7 +65,7 @@ public class WxMemController extends BaseController {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "memCode转换失败"); return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "memCode转换失败");
} }


WxMerchantBUser bUser = getUser();
WxMerchantBUser bUser = getLoginBUser();


// WxCUser cUser = userService.getById(id); // WxCUser cUser = userService.getById(id);
// if(cUser == null) { // if(cUser == null) {


+ 5
- 1
mallinkBApi/src/main/java/com/iformall/controller/WxMerchantBUserController.java Просмотреть файл

@@ -14,6 +14,7 @@ import com.iformall.enums.EnumCreditLockedStatus;
import com.iformall.enums.EnumMerchantBUserStatus; import com.iformall.enums.EnumMerchantBUserStatus;
import com.iformall.enums.EnumMerchantStatus; import com.iformall.enums.EnumMerchantStatus;
import com.iformall.service.*; import com.iformall.service.*;
import com.iformall.utils.Constant;
import com.iformall.utils.HashUtil; import com.iformall.utils.HashUtil;
import com.iformall.utils.IPUtil; import com.iformall.utils.IPUtil;
import io.swagger.annotations.Api; import io.swagger.annotations.Api;
@@ -64,7 +65,7 @@ public class WxMerchantBUserController extends BaseController {
public ResultData detail() { public ResultData detail() {
Map resultMap = new HashMap(); Map resultMap = new HashMap();


WxMerchantBUser user = getUser();
WxMerchantBUser user = getLoginBUser();


if (user == null){ if (user == null){
return new ResultData(ErrorCode.USER_IS_EMPTY); return new ResultData(ErrorCode.USER_IS_EMPTY);
@@ -169,6 +170,7 @@ public class WxMerchantBUserController extends BaseController {
Map<String, Object> resultMap = new HashMap<>(); Map<String, Object> resultMap = new HashMap<>();
resultMap.put("bUserId", orgUser.getId()); resultMap.put("bUserId", orgUser.getId());
resultMap.put("logined", true); resultMap.put("logined", true);
request.setAttribute(Constant.LOGIN_B_USER_KEY, orgUser.getId());
return new ResultData(resultMap); return new ResultData(resultMap);
} else { } else {
return new ResultData(ErrorCode.PASSWORD_ERROR); return new ResultData(ErrorCode.PASSWORD_ERROR);
@@ -188,6 +190,8 @@ public class WxMerchantBUserController extends BaseController {
Map<String, Object> resultMap = new HashMap<>(); Map<String, Object> resultMap = new HashMap<>();
resultMap.put("merchantList", merchantListInfo); resultMap.put("merchantList", merchantListInfo);
resultMap.put("logined", true); resultMap.put("logined", true);
resultMap.put("bUserId", orgUser.getId());
request.setAttribute(Constant.LOGIN_B_USER_KEY, orgUser.getId());
return new ResultData(resultMap); return new ResultData(resultMap);
} else { } else {
logger.error(ErrorCode.PASSWORD_ERROR.getMessage()); logger.error(ErrorCode.PASSWORD_ERROR.getMessage());


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

@@ -105,8 +105,8 @@ public class WxMerchantController extends BaseController {
public ResultData getOpenIdByPhone(@ModelAttribute String phone) { public ResultData getOpenIdByPhone(@ModelAttribute String phone) {
log.debug("[" + getIpAddr() + "] WxMerchantController::getOpenIdByPhone"); log.debug("[" + getIpAddr() + "] WxMerchantController::getOpenIdByPhone");
// hasPermission // hasPermission
WxMerchantBUser user = getUser();
WxBuser buser = getBuser();
WxMerchantBUser user = getLoginBUser();
WxBuser buser = getWxBuser();
WxMerchant merchant = new WxMerchant(); WxMerchant merchant = new WxMerchant();
merchant.setId(user.getMerchantId()); merchant.setId(user.getMerchantId());
WxMerchant wxMerchant = wxMerchantService.findOne(merchant); WxMerchant wxMerchant = wxMerchantService.findOne(merchant);
@@ -133,8 +133,8 @@ public class WxMerchantController extends BaseController {
} }


public boolean hasPermission() { public boolean hasPermission() {
WxMerchantBUser user = getUser();
WxBuser buser = getBuser();
WxMerchantBUser user = getLoginBUser();
WxBuser buser = getWxBuser();
WxMerchant merchant = new WxMerchant(); WxMerchant merchant = new WxMerchant();
merchant.setId(user.getMerchantId()); merchant.setId(user.getMerchantId());
WxMerchant wxMerchant = wxMerchantService.findOne(merchant); WxMerchant wxMerchant = wxMerchantService.findOne(merchant);


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

@@ -33,7 +33,7 @@ public class WxMerchantSubsidyController extends BaseController {
String ipStr = getIpAddr(); String ipStr = getIpAddr();
logger.info("subsidy/sum: " + ipStr + " :" + wxMerchantSubsidy.toString()); logger.info("subsidy/sum: " + ipStr + " :" + wxMerchantSubsidy.toString());
if (wxMerchantSubsidy == null) wxMerchantSubsidy = new WxMerchantSubsidyVo(); if (wxMerchantSubsidy == null) wxMerchantSubsidy = new WxMerchantSubsidyVo();
WxMerchantBUser user = getUser();
WxMerchantBUser user = getLoginBUser();
wxMerchantSubsidy.updateTenantInfo(user); wxMerchantSubsidy.updateTenantInfo(user);
wxMerchantSubsidy.setMerchantId(user.getMerchantId()); wxMerchantSubsidy.setMerchantId(user.getMerchantId());
List<Map<String, Object>> retMap = wxMerchantSubsidyService.sumForSubsidy(wxMerchantSubsidy); List<Map<String, Object>> retMap = wxMerchantSubsidyService.sumForSubsidy(wxMerchantSubsidy);
@@ -49,7 +49,7 @@ public class WxMerchantSubsidyController extends BaseController {
String ipStr = getIpAddr(); String ipStr = getIpAddr();
logger.info("subsidy/list: " + ipStr + " :" + wxMerchantSubsidy.toString()); logger.info("subsidy/list: " + ipStr + " :" + wxMerchantSubsidy.toString());
if (wxMerchantSubsidy == null) wxMerchantSubsidy = new WxMerchantSubsidyVo(); if (wxMerchantSubsidy == null) wxMerchantSubsidy = new WxMerchantSubsidyVo();
WxMerchantBUser user = getUser();
WxMerchantBUser user = getLoginBUser();
wxMerchantSubsidy.updateTenantInfo(user); wxMerchantSubsidy.updateTenantInfo(user);
wxMerchantSubsidy.setMerchantId(user.getMerchantId()); wxMerchantSubsidy.setMerchantId(user.getMerchantId());
final PageInfo<WxMerchantSubsidyVo> page = wxMerchantSubsidyService.listAsPage(wxMerchantSubsidy, pageNum, pageSize); final PageInfo<WxMerchantSubsidyVo> page = wxMerchantSubsidyService.listAsPage(wxMerchantSubsidy, pageNum, pageSize);
@@ -63,7 +63,7 @@ public class WxMerchantSubsidyController extends BaseController {
if (null == wxMerchantSubsidy) { if (null == wxMerchantSubsidy) {
wxMerchantSubsidy = new WxMerchantSubsidyVo(); wxMerchantSubsidy = new WxMerchantSubsidyVo();
} }
WxMerchantBUser user = getUser();
WxMerchantBUser user = getLoginBUser();
wxMerchantSubsidy.updateTenantInfo(user); wxMerchantSubsidy.updateTenantInfo(user);
wxMerchantSubsidy.setMerchantId(user.getMerchantId()); wxMerchantSubsidy.setMerchantId(user.getMerchantId());
Map<String, Long> data = wxMerchantSubsidyService.summary(wxMerchantSubsidy); Map<String, Long> data = wxMerchantSubsidyService.summary(wxMerchantSubsidy);


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

@@ -39,20 +39,20 @@ public class WxMerchantTradeDailyController extends BaseController {
@GetMapping("/getVolume") @GetMapping("/getVolume")
public ResultData getVolume(WxMerchantTradeDaily wxMerchantTradeDaily) { public ResultData getVolume(WxMerchantTradeDaily wxMerchantTradeDaily) {
wxMerchantTradeDaily.updateTenantInfo(getTenantInfo()); wxMerchantTradeDaily.updateTenantInfo(getTenantInfo());
return wxMerchantTradeDailyService.getVolume(wxMerchantTradeDaily,getUser().getId());
return wxMerchantTradeDailyService.getVolume(wxMerchantTradeDaily,getLoginBUser().getId());
} }


@ApiOperation("获得近7日解单") @ApiOperation("获得近7日解单")
@GetMapping("/getVolumeOfWeek") @GetMapping("/getVolumeOfWeek")
public ResultData getVolumeOfWeek() { public ResultData getVolumeOfWeek() {
return wxMerchantTradeDailyService.getVolumeOfWeek(getUser().getId());
return wxMerchantTradeDailyService.getVolumeOfWeek(getLoginBUser().getId());
} }


@ApiOperation("上报每日解单") @ApiOperation("上报每日解单")
@GetMapping("/reportDailyVolume") @GetMapping("/reportDailyVolume")
@ApiImplicitParam(name = "volume", value = "总金额(分)", dataType = "Integer", paramType = "query", required = true) @ApiImplicitParam(name = "volume", value = "总金额(分)", dataType = "Integer", paramType = "query", required = true)
public ResultData saveDailyTradingVolume(Integer volume) { public ResultData saveDailyTradingVolume(Integer volume) {
return wxMerchantTradeDailyService.saveDailyTradingVolume(getUser().getId(), volume);
return wxMerchantTradeDailyService.saveDailyTradingVolume(getLoginBUser().getId(), volume);
} }


/** /**
@@ -82,7 +82,7 @@ public class WxMerchantTradeDailyController extends BaseController {
wxMerchantTradeDaily.setTradeAmt(Double.parseDouble(wxMerchantTradeDaily.getTradeAmt())*100 +""); wxMerchantTradeDaily.setTradeAmt(Double.parseDouble(wxMerchantTradeDaily.getTradeAmt())*100 +"");
} }


WxMerchantBUser user = wxMerchantBUserService.getById(getUser().getId());
WxMerchantBUser user = wxMerchantBUserService.getById(getLoginBUser().getId());
if (user==null) if (user==null)
return new ResultData(ErrorCode.USER_IS_EMPTY); return new ResultData(ErrorCode.USER_IS_EMPTY);
WxMerchant merchant = wxMerchantService.getById(user.getMerchantId()); WxMerchant merchant = wxMerchantService.getById(user.getMerchantId());
@@ -103,9 +103,9 @@ public class WxMerchantTradeDailyController extends BaseController {
} }


} }
wxMerchantTradeDaily.setbUserId(getUser().getId());
wxMerchantTradeDaily.setbUserId(getLoginBUser().getId());
logger.info("1------------------------------------" + wxMerchantTradeDaily.getbUserId()); logger.info("1------------------------------------" + wxMerchantTradeDaily.getbUserId());
wxMerchantTradeDaily.setBUserId(getUser().getId());
wxMerchantTradeDaily.setBUserId(getLoginBUser().getId());
logger.info("2------------------------------------" + wxMerchantTradeDaily.getBUserId()); logger.info("2------------------------------------" + wxMerchantTradeDaily.getBUserId());
wxMerchantTradeDailyService.saveOrUpdate(wxMerchantTradeDaily); wxMerchantTradeDailyService.saveOrUpdate(wxMerchantTradeDaily);
return new ResultData(); return new ResultData();
@@ -126,7 +126,7 @@ public class WxMerchantTradeDailyController extends BaseController {
SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd"); SimpleDateFormat sd = new SimpleDateFormat("yyyy-MM-dd");


//根据userid查询merchantId //根据userid查询merchantId
WxMerchantBUser user = wxMerchantBUserService.getById(getUser().getId());
WxMerchantBUser user = wxMerchantBUserService.getById(getLoginBUser().getId());
if (user==null) if (user==null)
return new ResultData(ErrorCode.USER_IS_EMPTY); return new ResultData(ErrorCode.USER_IS_EMPTY);
WxMerchant merchant = wxMerchantService.getById(user.getMerchantId()); WxMerchant merchant = wxMerchantService.getById(user.getMerchantId());


+ 12
- 9
mallinkBApi/src/main/java/com/iformall/controller/WxMicroPayController.java Просмотреть файл

@@ -88,7 +88,7 @@ public class WxMicroPayController extends BaseController {
String ipStr = IPUtil.getIpAddr(request); String ipStr = IPUtil.getIpAddr(request);


WxMerchantBUser user = getUser();
WxMerchantBUser user = getLoginBUser();


WxOrder order = null; WxOrder order = null;
try { try {
@@ -129,7 +129,7 @@ public class WxMicroPayController extends BaseController {
} }
private ResultData queryMicopayOrder(String payOrderIdStr,String orderIdStr,EnumPayWay payWay) { private ResultData queryMicopayOrder(String payOrderIdStr,String orderIdStr,EnumPayWay payWay) {
WxMerchantBUser user = getUser();
WxMerchantBUser user = getLoginBUser();
if (StringUtils.isBlank(payOrderIdStr)) { if (StringUtils.isBlank(payOrderIdStr)) {
logger.error("payOrderId不能为空"); logger.error("payOrderId不能为空");
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "payOrderId不能为空"); return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "payOrderId不能为空");
@@ -240,7 +240,7 @@ public class WxMicroPayController 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 listMicroPay(String date, Integer pageNum, Integer pageSize) { public ResultData listMicroPay(String date, Integer pageNum, Integer pageSize) {
return wxOrderService.microPayListOnDateAsPage(getUser().getId(), EnumOrderType.MICROPAY.getCode(), date, pageNum, pageSize);
return wxOrderService.microPayListOnDateAsPage(getLoginBUser().getId(), EnumOrderType.MICROPAY.getCode(), date, pageNum, pageSize);
} }


@RedisCache @RedisCache
@@ -249,7 +249,7 @@ public class WxMicroPayController extends BaseController {
@ApiImplicitParams({ @ApiImplicitParams({
@ApiImplicitParam(name = "date", value = "日期yyyy-MM-dd", dataType = "string", paramType = "query")}) @ApiImplicitParam(name = "date", value = "日期yyyy-MM-dd", dataType = "string", paramType = "query")})
public ResultData getMicroPayAmountOnDate(String date) { public ResultData getMicroPayAmountOnDate(String date) {
return wxOrderService.microPayListOnDateAsPage(getUser().getId(), EnumOrderType.MICROPAY.getCode(), date, null, null);
return wxOrderService.microPayListOnDateAsPage(getLoginBUser().getId(), EnumOrderType.MICROPAY.getCode(), date, null, null);
} }


@ApiOperation("付款码支付某日异常交易分页列表接口") @ApiOperation("付款码支付某日异常交易分页列表接口")
@@ -259,7 +259,7 @@ public class WxMicroPayController 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 listMicroPayExp(String date, Integer pageNum, Integer pageSize) { public ResultData listMicroPayExp(String date, Integer pageNum, Integer pageSize) {
return wxOrderService.microPayExpListOnDateAsPage(getUser().getId(), EnumOrderType.MICROPAY.getCode(), date, pageNum, pageSize);
return wxOrderService.microPayExpListOnDateAsPage(getLoginBUser().getId(), EnumOrderType.MICROPAY.getCode(), date, pageNum, pageSize);
} }




@@ -282,7 +282,7 @@ public class WxMicroPayController extends BaseController {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL);
} }


WxMerchantBUser bUser = getUser();
WxMerchantBUser bUser = getLoginBUser();
WxAppinfo appinfo = getAppInfo(bUser.getAppId()); WxAppinfo appinfo = getAppInfo(bUser.getAppId());
try { try {
ResultData rd = wxRefundOrderService.createRefundOrderFromMicroPay(appinfo, orderId, EnumPayType.PAY_B_REFUND, bUser.getId()); ResultData rd = wxRefundOrderService.createRefundOrderFromMicroPay(appinfo, orderId, EnumPayType.PAY_B_REFUND, bUser.getId());
@@ -303,7 +303,7 @@ public class WxMicroPayController extends BaseController {
@PostMapping("order_create_v2") @PostMapping("order_create_v2")
public ResultData saveMicopayOrderV2(@RequestBody Map<String, String> paramMap, HttpServletRequest request) { public ResultData saveMicopayOrderV2(@RequestBody Map<String, String> paramMap, HttpServletRequest request) {
logger.info("saveMicopayOrderV2: " + paramMap.toString()); logger.info("saveMicopayOrderV2: " + paramMap.toString());
WxMerchantBUser user = getUser();
WxMerchantBUser user = getLoginBUser();
String cUserIdStr = paramMap.get("cUserId"); String cUserIdStr = paramMap.get("cUserId");
String phone = paramMap.get("phone"); String phone = paramMap.get("phone");
String payPriceStr = paramMap.get("payPrice"); String payPriceStr = paramMap.get("payPrice");
@@ -385,7 +385,7 @@ public class WxMicroPayController extends BaseController {


private ResultData saveMicopayPayOrder(String orderIdStr,String couponOrderIdStr,String authCode,String payPriceStr, private ResultData saveMicopayPayOrder(String orderIdStr,String couponOrderIdStr,String authCode,String payPriceStr,
EnumPayWay payWay, HttpServletRequest request) { EnumPayWay payWay, HttpServletRequest request) {
WxMerchantBUser user = getUser();
WxMerchantBUser user = getLoginBUser();
if (StringUtils.isBlank(orderIdStr)) { if (StringUtils.isBlank(orderIdStr)) {
logger.error("orderId不能为空"); logger.error("orderId不能为空");
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "orderId不能为空"); return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL.getCode(), "orderId不能为空");
@@ -413,7 +413,10 @@ public class WxMicroPayController extends BaseController {
logger.error("核销员ID不存在:" + user.getId()); logger.error("核销员ID不存在:" + user.getId());
throw new MallinkException(ErrorCode.USER_IS_EMPTY.getCode(), "核销员ID不存在或者无权限"); throw new MallinkException(ErrorCode.USER_IS_EMPTY.getCode(), "核销员ID不存在或者无权限");
} }
wxMerchantBUser.setBuserId(getBuserId());
Long bUserId = getWxBuserId();
if (null != bUserId) {
wxMerchantBUser.setBuserId(bUserId);
}


Long couponOrderId = 0L, orderId = 0L; Long couponOrderId = 0L, orderId = 0L;




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

@@ -48,7 +48,7 @@ public class WxRefundOrderController extends BaseController {
return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL); return new ResultData(ErrorCode.SYS_PARAMETER_NOT_NULL);
} }


WxMerchantBUser bUser = getUser();
WxMerchantBUser bUser = getLoginBUser();
WxAppinfo appinfo = getAppInfo(bUser.getAppId()); WxAppinfo appinfo = getAppInfo(bUser.getAppId());
try { try {
ResultData rd = wxRefundOrderService.createRefundOrder(appinfo, couponOrderId, EnumPayType.PAY_B_REFUND, bUser.getId()); ResultData rd = wxRefundOrderService.createRefundOrder(appinfo, couponOrderId, EnumPayType.PAY_B_REFUND, bUser.getId());


+ 43
- 18
mallinkBApi/src/main/java/com/iformall/interceptor/AuthorizationInterceptor.java Просмотреть файл

@@ -6,8 +6,10 @@ import com.iformall.annotation.TenantIgnore;
import com.iformall.common.ErrorCode; import com.iformall.common.ErrorCode;
import com.iformall.common.TenantThreadLocal; import com.iformall.common.TenantThreadLocal;
import com.iformall.domain.po.WxBuser; import com.iformall.domain.po.WxBuser;
import com.iformall.domain.po.WxMerchantBUser;
import com.iformall.exception.MallinkException; import com.iformall.exception.MallinkException;
import com.iformall.service.WxBuserTokenService; import com.iformall.service.WxBuserTokenService;
import com.iformall.service.WxMerchantBUserService;
import com.iformall.utils.Constant; import com.iformall.utils.Constant;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
@@ -29,6 +31,9 @@ public class AuthorizationInterceptor extends HandlerInterceptorAdapter {


@Autowired @Autowired
private WxBuserTokenService userTokenService; private WxBuserTokenService userTokenService;
@Autowired
private WxMerchantBUserService wxMerchantBUserService;


@Override @Override
public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception { public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
@@ -50,25 +55,48 @@ public class AuthorizationInterceptor extends HandlerInterceptorAdapter {
if(StringUtils.isBlank(token)){ if(StringUtils.isBlank(token)){
token = request.getParameter("token"); token = request.getParameter("token");
} }
String bid = request.getHeader("bid");
//如果header中不存在token,则从参数中获取token
if(StringUtils.isBlank(bid)){
bid = request.getParameter("bid");
}


//token为空
if(StringUtils.isBlank(token)){
//token为空,
if(StringUtils.isBlank(token) && StringUtils.isBlank(bid)){
throw new MallinkException(ErrorCode.NET_TOKEN_EMPTY); throw new MallinkException(ErrorCode.NET_TOKEN_EMPTY);
} }


// 查询token信息 // 查询token信息


WxBuser wxBuser = userTokenService.getByToken(token);
if (wxBuser == null || wxBuser.getExpireTime().getTime() < System.currentTimeMillis()) {
throw new MallinkException(ErrorCode.NET_TOKEN_INVALID.getCode(), "URL:" + request.getRequestURL() + " token失效,请重新登录");
}
//设置userId到request里,后续根据userId,获取用户信息
request.setAttribute(Constant.LOGIN_USER_KEY, wxBuser.getId());
request.setAttribute(Constant.TENANT_ID, wxBuser.getTenantId());
if (StringUtils.isNotBlank(wxBuser.getParentTenantId())) {
request.setAttribute(Constant.PARENT_TENANT_ID, wxBuser.getParentTenantId());
String tenantId = null;
String parenTenantId = null;
if (!StringUtils.isBlank(token)) {
WxBuser wxBuser = userTokenService.getByToken(token);
if (wxBuser == null || wxBuser.getExpireTime().getTime() < System.currentTimeMillis()) {
throw new MallinkException(ErrorCode.NET_TOKEN_INVALID.getCode(), "URL:" + request.getRequestURL() + " token失效,请重新登录");
}
//设置userId到request里,后续根据userId,获取用户信息
tenantId = wxBuser.getTenantId();
parenTenantId = wxBuser.getParentTenantId();
request.setAttribute(Constant.LOGIN_USER_KEY, wxBuser.getId());
request.setAttribute(Constant.TENANT_ID, tenantId);
if (StringUtils.isNotBlank(parenTenantId)) {
request.setAttribute(Constant.PARENT_TENANT_ID, parenTenantId);
}
}else if (!StringUtils.isBlank(bid)) {
WxMerchantBUser buser = wxMerchantBUserService.getById(Long.parseLong(bid));
if (buser == null) {
throw new MallinkException(ErrorCode.NET_TOKEN_INVALID.getCode(), "URL:" + request.getRequestURL() + " bid失效,请重新登录");
}
tenantId = buser.getTenantId();
parenTenantId = buser.getParentTenantId();
request.setAttribute(Constant.LOGIN_B_USER_KEY, buser.getId());
request.setAttribute(Constant.TENANT_ID, tenantId);
if (StringUtils.isNotBlank(parenTenantId)) {
request.setAttribute(Constant.PARENT_TENANT_ID, parenTenantId);
}
} }


@@ -82,12 +110,9 @@ public class AuthorizationInterceptor extends HandlerInterceptorAdapter {
if(tenantIgnoreAnnotation != null){ if(tenantIgnoreAnnotation != null){
TenantThreadLocal.remove(); TenantThreadLocal.remove();
}else { }else {
TenantThreadLocal.setCurrentThreadTenant(wxBuser.getTenantId(), wxBuser.getParentTenantId());
TenantThreadLocal.setCurrentThreadTenant(tenantId, parenTenantId);
} }
return true; return true;
} }
} }

+ 2
- 0
mallinkService/src/main/java/com/iformall/utils/Constant.java Просмотреть файл

@@ -34,6 +34,8 @@ public class Constant {
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";
public static final String REQUEST_C_USER_KEY = "REQUEST_C_USER"; public static final String REQUEST_C_USER_KEY = "REQUEST_C_USER";
public static final String LOGIN_B_USER_KEY = "LOGIN_B_USER_KEY";




public static final String adminPage = "https://admin.malls.iformall.com"; public static final String adminPage = "https://admin.malls.iformall.com";


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