Merge remote-tracking branch 'origin/master'

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

@@ -44,7 +44,7 @@ public class WalletRechargeInvoiceController {
 
     @GetMapping("/back")
     @Operation(summary = "退回作废发票")
-    public R backInvoice(@RequestParam Long id) {
+    public R backInvoice(@RequestParam("id") Long id) {
         walletRechargeInvoiceService.backInvoice(id);
         return R.ok();
     }

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

@@ -217,7 +217,7 @@ public class WalletRechargeInvoiceServiceImpl extends ServiceImpl<WalletRecharge
         if (ObjectUtil.isEmpty(list)) return;
         for (Long v : list) {
             WalletRechargeInvoiceEntity detail = baseMapper.selectById(v);
-            if (ObjectUtil.isEmpty(detail) || ObjectUtil.isEmpty(detail.getApplyId())) continue;
+            if (ObjectUtil.isEmpty(detail)) continue;
             if (ObjectUtil.isNotEmpty(detail.getStatus()) && ObjectUtil.notEqual(detail.getStatus(), WalletRechargeInvoiceStatusEnum.UNBIND.getCode())) {
                 UserInfo userInfo = remoteUserService.getByUserId(detail.getApplyUserId()).getData();
                 throw new RuntimeException("用户<" + userInfo.getSysUser().getName() + ">创建的发票已经" + WalletRechargeInvoiceStatusEnum.codeOf(detail.getStatus()).getDesc() + "不能删除");
@@ -225,7 +225,7 @@ public class WalletRechargeInvoiceServiceImpl extends ServiceImpl<WalletRecharge
             // 删除申请记录
             baseMapper.deleteById(v);
             // 删除申请记录条目
-            importMapper.delete(new LambdaQueryWrapper<WalletRechargeImportEntity>().eq(WalletRechargeImportEntity::getApplyId, v));
+            importMapper.delete(new LambdaQueryWrapper<WalletRechargeImportEntity>().eq(WalletRechargeImportEntity::getInvoiceId, v));
         }
     }
 

pjcloud-wallet/pjcloud-wallet-biz/src/main/resources/mapper/recharge/WalletRechargeApplyMapper.xml

@@ -27,9 +27,12 @@
 
     <sql id="whereA">
         a.del_flag = '0'
-        <if test="dto.processStatus != null and dto.processStatus != '' ">
+        <if test="dto.processStatus != null and dto.processStatus != '' and dto.processStatus != 99 ">
             and a.process_status = #{dto.processStatus}
         </if>
+        <if test="dto.processStatus != null and dto.processStatus != '' and dto.processStatus == 99 ">
+            and a.process_id is null
+        </if>
         <if test="dto.userId != null">
             and a.user_id = #{dto.userId}
         </if>