Merge branch 'refs/heads/dev' into test

share-admin/src/main/resources/application-test.yml

@@ -238,4 +238,4 @@ mqtt:
   device-op-last-time: -5
   device-gateway-last-report-time: -10
 api:
-  domain: https://www.coujio.com
+  domain: https://coujiao.pseer.com
\ No newline at end of file

share-front/src/main/java/share/web/controller/system/RechargeConfController.java

@@ -8,6 +8,7 @@ import share.common.core.domain.AjaxResult;
 import share.common.core.domain.R;
 import share.common.core.page.TableDataInfo;
 import share.common.enums.BusinessType;
+import share.common.enums.YesNoEnum;
 import share.common.utils.poi.ExcelUtil;
 import share.system.domain.RechargeConf;
 import share.system.service.RechargeConfService;
@@ -33,6 +34,7 @@ public class RechargeConfController extends BaseController {
     @GetMapping("/list")
     public TableDataInfo list(RechargeConf rechargeConf) {
         startPage();
+        rechargeConf.setEnable(YesNoEnum.yes.getIndex().toString());
         List<RechargeConf> list = rechargeConfService.selectRechargeConfList(rechargeConf);
         return getDataTable(list);
     }

share-front/src/main/resources/application-test.yml

@@ -235,4 +235,4 @@ mqtt:
   device-op-last-time: -5
   device-gateway-last-report-time: -10
 api:
-  domain: https://www.coujio.com
+  domain: https://coujiao.pseer.com

share-system/src/main/java/share/system/service/impl/RechargeServiceImpl.java

@@ -222,7 +222,7 @@ public class RechargeServiceImpl extends ServiceImpl<RechargeMapper, Recharge> i
             BigDecimal balance = recharge.getRechargeAmount().add(rechargeConf.getGiveAmount());
             consumerWallet.setBalance(balance);
         } else {
-            consumerWallet.setBalance(new BigDecimal(0));
+            consumerWallet.setBalance(recharge.getRechargeAmount());
         }
         if (rechargeConf.getGiveType().contains(GiveTypeEnum.DURATION.getIndex())) {
             consumerWallet.setRemainingDuration(rechargeConf.getGiveDuration());