Merge remote-tracking branch 'origin/master'

pjcloud-thirdparty/pjcloud-thirdparty-biz/src/main/resources/application.yml

@@ -88,7 +88,7 @@ zy:
 #   callback-base-url: http://h1yzkslmyx.ny.takin.cc
 #   callback-recognition-url: /third/third-ks/callback/recognition
 #   callback-sku-url: /third/third-ks/callback/sku
-lb:
+# lb:
   # 测试环境
   # base-url: https://elss-sit.nbcb.com.cn
   # app-id: 7da62b1a9ade473c917f573c5748081e
@@ -97,11 +97,11 @@ lb:
   # sm4-key: S67157e8aQs2tFSX
 
   # 正式环境
-  base-url: https://elss.nbcb.com.cn
-  app-id: 528e3ca76ec34f5c9b3255ba18aee774
-  app-secret: tIhDZDXWhtP6bvd0J9Q0zjIZxSkmyX+uUc87xnDTgfc=
-  company-number: 202504673472
-  sm4-key: 63P839eg0uxE5aoG
+  # base-url: https://elss.nbcb.com.cn
+  # app-id: 528e3ca76ec34f5c9b3255ba18aee774
+  # app-secret: tIhDZDXWhtP6bvd0J9Q0zjIZxSkmyX+uUc87xnDTgfc=
+  # company-number: 202504673472
+  # sm4-key: 63P839eg0uxE5aoG
 
 
 sms:

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

@@ -42,6 +42,13 @@ public class WalletRechargeInvoiceController {
         return R.ok(walletRechargeInvoiceService.getInvoice(id));
     }
 
+    @GetMapping("/back")
+    @Operation(summary = "退回作废发票")
+    public R backInvoice(@RequestParam Long id) {
+        walletRechargeInvoiceService.backInvoice(id);
+        return R.ok();
+    }
+
     @PostMapping("/bind-invoice")
     @Operation(summary = "绑定发票")
     public R bindInvoice(@Valid @RequestBody WalletRechargeBindInvoiceDto dto) {

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

@@ -13,6 +13,11 @@ import java.util.ArrayList;
 
 public interface WalletRechargeInvoiceService extends IService<WalletRechargeInvoiceEntity> {
 
+    /**
+     * 退回作废发票
+     */
+    void backInvoice(Long id);
+
     /**
      * 分页查询
      */

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

@@ -50,6 +50,19 @@ public class WalletRechargeInvoiceServiceImpl extends ServiceImpl<WalletRecharge
     private final RemoteUserService remoteUserService;
     private final RemoteWalletSettingService remoteWalletSettingService;
 
+    /**
+     * 退回作废发票
+     */
+    @Override
+    public void backInvoice(Long id) {
+        WalletRechargeInvoiceVo detail = baseMapper.joinById(id);
+        if (ObjectUtil.isEmpty(detail)) throw new RuntimeException("查询不到发票");
+        baseMapper.update(new LambdaUpdateWrapper<WalletRechargeInvoiceEntity>()
+                .set(WalletRechargeInvoiceEntity::getPicUrl, null)
+                .eq(WalletRechargeInvoiceEntity::getId, id)
+        );
+    }
+
     /**
      * 分页查询
      */