修改月度奖励

wisenergy-model/src/main/java/cn/wisenergy/model/app/MonthAward.java

@@ -5,7 +5,6 @@ import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
 import java.io.Serializable;
-import java.math.BigDecimal;
 import java.util.Date;
 
 /**

wisenergy-service/src/main/java/cn/wisenergy/service/app/BankService.java

@@ -4,6 +4,8 @@ import cn.wisenergy.common.utils.R;
 import cn.wisenergy.model.app.BankInfo;
 import cn.wisenergy.model.dto.WithdrawBankDto;
 
+import java.util.List;
+
 /**
  * @author 86187
  */
@@ -48,4 +50,11 @@ public interface BankService {
      */
     R<Boolean> userWithdrawBank(WithdrawBankDto dto);
 
+
+    /**
+     * 获取银行卡名称列表
+     * @return
+     */
+    R<List<String>> getBankNameList();
+
 }

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/BankServiceImpl.java

@@ -19,6 +19,9 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * @author 86187
  * @ Description: 银行卡相关接口实现
@@ -166,4 +169,22 @@ public class BankServiceImpl extends ServiceImpl<BankInfoMapper, BankInfo> imple
         }
         return R.ok(0, true);
     }
+
+    @Override
+    public R<List<String>> getBankNameList() {
+        log.info("shop-mall[]BankServiceImpl[]edit[]input.method");
+
+        List<String> list = new ArrayList<>();
+        list.add("中国工商银行");
+        list.add("中国农业银行");
+        list.add("中国建设银行");
+        list.add("中国交通银行");
+        list.add("中国民生银行");
+        list.add("中国招商银行");
+        list.add("中国农商银行");
+        list.add("中国银行");
+        list.add("平安银行");
+        list.add("中国邮政储蓄银行");
+        return R.ok(list);
+    }
 }

wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/MonthAwardServiceImpl.java

@@ -51,7 +51,11 @@ public class MonthAwardServiceImpl extends ServiceImpl<MonthAwardMapper, MonthAw
 
         //获取用户本月奖金
         Double sum = tradeRecordMapper.queryMonthAward(userId, new Date());
+        if (null == sum) {
+            monthAwardVo.setUserMonthAward(0.00);
+        } else {
             monthAwardVo.setUserMonthAward(sum);
+        }
         return R.ok(monthAwardVo);
     }
 }

wisenergy-web-admin/src/main/java/cn/wisenergy/web/admin/controller/app/BankController.java

@@ -12,6 +12,8 @@ import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import java.util.List;
+
 /**
  * @author 86187
  */
@@ -80,4 +82,11 @@ public class BankController {
 
         return bankService.userWithdrawBank(dto);
     }
+
+    @ApiOperation(value = "获取银行名称列表", notes = "获取银行名称列表", httpMethod = "GET")
+    @GetMapping("/getBankNameList")
+    public R<List<String>> getBankNameList() {
+        log.info("shop-mall[]BankController[]getBankNameList[]input.method");
+        return bankService.getBankNameList();
+    }
 }