ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/controller/business/MerOrderController.java
@@ -52,6 +52,7 @@ break; case 2: MerVerifyCouponVo merVerifyCouponVo = orderService.verifyCoupon(verifyCode,merVerifyCodeDto.getShopId()); merVerifyCouponVo.setCouponId(merVerifyCouponVo.getMemberCouponId().toString()); merVerifyCodeVo.setMerVerifyCouponVo(merVerifyCouponVo); break; case 3: ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MerVerifyCouponVo.java
@@ -29,6 +29,9 @@ @ApiModelProperty(value = "优惠券id") private Long memberCouponId; @ApiModelProperty(value = "优惠券id--前端") private String couponId; @ApiModelProperty(value = "优惠券名称") private String couponName; ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/service/impl/order/OrderServiceImpl.java
@@ -2237,7 +2237,11 @@ @Transactional @GlobalTransactional(rollbackFor = Exception.class) public MerVerifyCouponVo sureVerifyCoupon(MerVerifyCouponDto merVerifyCouponDto) { MerVerifyCouponGetVo verifyCouponGetVo = remoteCouponService.getVerifyCoupon(merVerifyCouponDto.getMemberCouponId()).getData(); R<MerVerifyCouponGetVo> verifyCoupon = remoteCouponService.getVerifyCoupon(merVerifyCouponDto.getMemberCouponId()); if(verifyCoupon.getCode() != 200){ throw new ServiceException(verifyCoupon.getMsg()); } MerVerifyCouponGetVo verifyCouponGetVo = verifyCoupon.getData(); MemberCoupon memberCoupon = verifyCouponGetVo.getMemberCoupon(); ShopRelUserVo shopRelUserVo = remoteShopService.getShopByUserId(merVerifyCouponDto.getUserId()).getData(); Long userId = verifyCouponGetVo.getUserId(); @@ -4599,7 +4603,11 @@ // 创建MerVerifyCouponVo对象 MerVerifyCouponVo merVerifyCouponVo = new MerVerifyCouponVo(); // 调用remoteCouponService的getVerifyCoupon方法获取MerVerifyCouponGetVo对象 MerVerifyCouponGetVo verifyCouponGetVo = remoteCouponService.getVerifyCoupon(Long.valueOf(verifyCode)).getData(); R<MerVerifyCouponGetVo> verifyCoupon = remoteCouponService.getVerifyCoupon(Long.valueOf(verifyCode)); if(verifyCoupon.getCode() != 200){ throw new ServiceException(verifyCoupon.getMsg()); } MerVerifyCouponGetVo verifyCouponGetVo = verifyCoupon.getData(); MemberCoupon memberCoupon = verifyCouponGetVo.getMemberCoupon(); // 检查优惠券状态 int couponStatus = memberCoupon.getCouponStatus(); ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/service/impl/shop/ShopServiceImpl.java
@@ -462,7 +462,7 @@ }else{ shop.setCooperativeFlag(0); } shop.setShopStatus(handelShopStatus(shop.getFrozenFlag(),shop.getCooperativeFlag(),shop.getAuthFlag())); shop.setShopStatus(handelShopStatus(null,shop.getCooperativeFlag(), null)); shop.setUpdateTime(new Date()); shop.setUpdateUserId(mgtTerminateCooperationDto.getUserId()); this.saveOrUpdate(shop); @@ -483,7 +483,7 @@ }else{ shop.setFrozenFlag(0); } shop.setShopStatus(handelShopStatus(shop.getFrozenFlag(),shop.getCooperativeFlag(),shop.getAuthFlag())); shop.setShopStatus(handelShopStatus(shop.getFrozenFlag(), null, null)); this.saveOrUpdate(shop); } @@ -496,16 +496,16 @@ */ private Integer handelShopStatus(Integer frozenFlag, Integer cooperativeFlag, Integer authFlag){ Integer shopStatus = 1; if(frozenFlag == 1){ if(null != frozenFlag && frozenFlag == 1){ shopStatus = 0; return shopStatus; } if(authFlag == 0){ shopStatus = 3; if(null != cooperativeFlag && cooperativeFlag == 0){ shopStatus = 2; return shopStatus; } if(cooperativeFlag == 0){ shopStatus = 2; if(null != authFlag && authFlag == 0){ shopStatus = 3; return shopStatus; } return shopStatus; @@ -1724,7 +1724,7 @@ private void applySuccessUpdateShopStatus(Long shopId){ // 更新商户状态为正常 Shop shop = this.getById(shopId); Integer shopStatus = handelShopStatus(shop.getFrozenFlag(), shop.getCooperativeFlag(), 1); Integer shopStatus = handelShopStatus(null, null, 1); LambdaUpdateWrapper<Shop> updateWrapper = Wrappers.lambdaUpdate(); updateWrapper.eq(Shop::getShopId, shopId) .set(Shop::getShopStatus, shopStatus) @@ -1856,7 +1856,7 @@ ProfitSharingReceiverResult result = wechatPayUtils.addProfitSharingReceiver(request); if(StringUtils.isNotBlank(result.getAccount())){ shop.setAccountFlag(1); shop.setShopStatus(handelShopStatus(shop.getFrozenFlag(),shop.getCooperativeFlag(),shop.getAuthFlag())); shop.setShopStatus(handelShopStatus(null , null,shop.getAuthFlag())); this.saveOrUpdate(shop); } } ruoyi-modules/ruoyi-system/src/main/java/com/ruoyi/system/controller/management/MgtStaffController.java
@@ -53,7 +53,7 @@ @RequestMapping(value = "/listMgtDeptStaff", method = RequestMethod.POST) @ApiOperation(value = "获取部门员工列表") public R<List<MgtDeptStaffListVo>> listMgtDeptStaff(@RequestBody String name) { public R<List<MgtDeptStaffListVo>> listMgtDeptStaff(@RequestBody ListMgtDeptStaffDto listMgtDeptStaffDto) { // 获取当前登陆人的可视权限 SysUser sysUser = SecurityUtils.getSysUser(); // 如果当前登陆人权限是查看部门数据 @@ -77,7 +77,7 @@ } } } List<MgtDeptStaffListVo> mgtDeptStaffListVoList= sysStaffService.listMgtDeptStaff(deptId,userId, name); List<MgtDeptStaffListVo> mgtDeptStaffListVoList= sysStaffService.listMgtDeptStaff(deptId,userId, listMgtDeptStaffDto.getName()); return R.ok(mgtDeptStaffListVoList); }
New file @@ -0,0 +1,15 @@ package com.ruoyi.system.domain.dto; import lombok.Data; /** * @author zhibing.pu * @Date 2024/3/19 11:52 */ @Data public class ListMgtDeptStaffDto { /** * 名称 */ private String name; }
