Merge remote-tracking branch 'origin/master'

pjcloud-upms/pjcloud-upms-api/src/main/java/com/bsd/pjcloud/admin/api/feign/RemoteUserService.java

@@ -78,8 +78,8 @@ public interface RemoteUserService {
     @PostMapping("/user/list")
     R<List<SysUser>> getUserById(@RequestBody List<Long> userIds);
 
-    @GetMapping("/user/user-dept")
-    R<List<UserVO>> getUserDeptByIds(@RequestParam("userIds") List<Long> userIds);
+    @PostMapping("/user/user-dept")
+    R<List<UserVO>> getUserDeptByIds(@RequestBody List<Long> userIds);
 
     /**
      * 通过社交账号或手机号查询用户、角色信息

pjcloud-upms/pjcloud-upms-biz/src/main/java/com/bsd/pjcloud/admin/controller/SysUserController.java

@@ -351,8 +351,8 @@ public class SysUserController {
         return R.ok(userService.list(Wrappers.<SysUser>lambdaQuery().in(SysUser::getUserId, userIds)));
     }
 
-    @GetMapping("/user-dept")
-    public R<List<UserVO>> getUserDeptByIds(@RequestParam("userIds") List<Long> userIds) {
+    @PostMapping("/user-dept")
+    public R<List<UserVO>> getUserDeptByIds(@RequestBody List<Long> userIds) {
         return R.ok(userService.getUserDeptByIds(userIds));
     }
 

pjcloud-upms/pjcloud-upms-biz/src/main/resources/mapper/SysUserMapper.xml

@@ -253,9 +253,9 @@
                     #{id}
                 </foreach>
             </if>
-            <if test="query.ids != null and query.ids.size() != 0">
+            <if test="ids != null">
                 AND u.user_id in
-                <foreach collection="query.ids" index="index" item="id" open="(" separator="," close=")">
+                <foreach collection="ids" index="index" item="id" open="(" separator="," close=")">
                     #{id}
                 </foreach>
             </if>

pjcloud-wallet/pjcloud-wallet-api/src/main/java/com/bsd/pjcloud/wallet/api/vo/recharge/WalletRechargeImportVo.java

@@ -10,7 +10,7 @@ import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 @Data
-public class WalletRechargeImportVo extends WalletRechargeImportEntity implements BaseUserDeptInterface, BaseWalletTypeInterface {
+public class WalletRechargeImportVo extends WalletRechargeImportEntity implements BaseUserDeptInterface, BaseWalletTypeInterface, BaseUserInterface {
     /**
      * 用户相关
      */

pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/controller/recharge/WalletRechargeImportController.java

@@ -131,6 +131,9 @@ public class WalletRechargeImportController {
                 BigDecimal priceStrSum = BigDecimal.ZERO;
                 for (WalletRechargeImportVo v : list) {
                     if (ObjectUtil.isNotEmpty(v.getPrice())) {
+                        if (ObjectUtil.equals(v.getBizType(), WalletBizRechargeEnum.REDUCTION.getCode()) && v.getPrice() > 0) {
+                            v.setPrice(v.getPrice() * -1);
+                        }
                         priceStrSum = priceStrSum.add(BigDecimal.valueOf(v.getPrice()));
                         v.setPriceStr(BigDecimal.valueOf(v.getPrice()).divide(BigDecimal.valueOf(100)).setScale(2, RoundingMode.HALF_UP).toString());
                     }

pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/WalletTransactionServiceImpl.java

@@ -21,7 +21,6 @@ import com.bsd.pjcloud.common.core.util.CollectionUtils;
 import com.bsd.pjcloud.common.core.util.R;
 import com.bsd.pjcloud.common.data.datascope.DataScope;
 import com.bsd.pjcloud.wallet.api.constant.WalletBizEnum;
-import com.bsd.pjcloud.wallet.api.constant.WalletBizRechargeEnum;
 import com.bsd.pjcloud.wallet.api.dto.WalletManageDto;
 import com.bsd.pjcloud.wallet.api.dto.WalletTransactionDto;
 import com.bsd.pjcloud.wallet.api.dto.WalletTypeDto;

pjcloud-wallet/pjcloud-wallet-biz/src/main/java/com/bsd/pjcloud/wallet/service/impl/recharge/WalletRechargeImportServiceImpl.java

@@ -5,6 +5,7 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.bsd.pjcloud.admin.api.entity.SysDept;
+import com.bsd.pjcloud.admin.api.entity.SysUser;
 import com.bsd.pjcloud.admin.api.feign.RemoteDeptService;
 import com.bsd.pjcloud.admin.api.feign.RemoteUserService;
 import com.bsd.pjcloud.admin.api.utils.DataUtil;