From 1a6f13c651a4bbd30af1aa380f5de88af3db2f62 Mon Sep 17 00:00:00 2001
From: licc <lichuchuan@jtep.com.cn>
Date: Tue, 23 Mar 2021 13:52:20 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=BC=96=E8=BE=91=E9=93=B6?=
 =?UTF-8?q?=E8=A1=8C=E5=8D=A1=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/MonthAwardMapper.xml     |  8 +++----
 .../service/app/impl/BankServiceImpl.java     | 23 +++++++++++++++----
 .../app/impl/TradeRecordServiceImpl.java      |  1 +
 3 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/wisenergy-mapper/src/main/resources/mapper/MonthAwardMapper.xml b/wisenergy-mapper/src/main/resources/mapper/MonthAwardMapper.xml
index 3bde162..1ced08d 100644
--- a/wisenergy-mapper/src/main/resources/mapper/MonthAwardMapper.xml
+++ b/wisenergy-mapper/src/main/resources/mapper/MonthAwardMapper.xml
@@ -27,7 +27,7 @@
 
     <sql id="cols_exclude_id">
         growth_award,award_total,month_award_total,month_increased,gold_award,farmer_award, forest_start_award,
-        partner_award,year_month,create_time,update_time
+        partner_award,`year_month`,create_time,update_time
     </sql>
 
     <sql id="vals">
@@ -44,7 +44,7 @@
         <if test="farmerAward != null">farmer_award =#{farmerAward},</if>
         <if test="forestStartAward != null">forest_start_award =#{forestStartAward},</if>
         <if test="partnerAward != null">partner_award =#{partnerAward},</if>
-        <if test="yearMonth != null">year_month =#{yearMonth},</if>
+        <if test="yearMonth != null">`year_month` =#{yearMonth},</if>
         update_time =now()
     </sql>
 
@@ -58,7 +58,7 @@
         <if test="farmerAward != null">and farmer_award =#{farmerAward}</if>
         <if test="forestStartAward != null">and forest_start_award =#{forestStartAward}</if>
         <if test="partnerAward != null">and partner_award =#{partnerAward}</if>
-        <if test="yearMonth != null">and year_month =#{yearMonth}</if>
+        <if test="yearMonth != null">and `year_month` =#{yearMonth}</if>
         <if test="createTime != null">and create_time &gt;= #{createTime}</if>
         <if test="updateTime != null">and #{updateTime} &gt;= update_time</if>
     </sql>
@@ -96,7 +96,7 @@
         <include refid="table"/>
         <where>
             <if test="yearMonth != null">
-                year_month=#{yearMonth}
+                `year_month`=#{yearMonth}
             </if>
         </where>
         order by create_time desc
diff --git a/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/BankServiceImpl.java b/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/BankServiceImpl.java
index 0c0790e..aa20e69 100644
--- a/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/BankServiceImpl.java
+++ b/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/BankServiceImpl.java
@@ -55,14 +55,29 @@ public class BankServiceImpl extends ServiceImpl<BankInfoMapper, BankInfo> imple
     @Override
     public R<BankInfo> add(BankInfo bankInfo) {
         log.info("shop-mall[]BankServiceImpl[]add[]input.param.bankInfo:" + bankInfo);
-        if (null == bankInfo) {
+        if (null == bankInfo || StringUtils.isBlank(bankInfo.getUserId())) {
             return R.error("入参不能为空!");
         }
-        int count = bankInfoMapper.add(bankInfo);
-        if (count == 0) {
+
+        //获取该用户下是否有银行卡信息  无：新增 有：编辑
+        BankInfo bank = bankInfoMapper.getByUserId(bankInfo.getUserId());
+        if (null == bank) {
+            int count = bankInfoMapper.add(bankInfo);
+            if (count == 0) {
+                return R.error("保存用户银行卡信息失败!");
+            }
+
+            return R.ok(bankInfo);
+        }
+        bank.setName(bankInfo.getName());
+        bank.setCardNumber(bankInfo.getCardNumber());
+        bank.setBankName(bankInfo.getBankName());
+        bank.setIdCardNo(bankInfo.getIdCardNo());
+        bank.setUserId(bankInfo.getUserId());
+        int number = bankInfoMapper.edit(bank);
+        if (number == 0) {
             return R.error("保存用户银行卡信息失败!");
         }
-
         return R.ok(bankInfo);
     }
 
diff --git a/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/TradeRecordServiceImpl.java b/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/TradeRecordServiceImpl.java
index 19981e1..5cc1dd7 100644
--- a/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/TradeRecordServiceImpl.java
+++ b/wisenergy-service/src/main/java/cn/wisenergy/service/app/impl/TradeRecordServiceImpl.java
@@ -119,6 +119,7 @@ public class TradeRecordServiceImpl extends ServiceImpl<TradeRecordMapper, Trade
                 return R.ok(1, false);
             }
         } else {
+            result.setId(currentMonthAward.getId());
             int count = monthAwardMapper.edit(result);
             if (count == 0) {
                 return R.ok(1, false);
-- 
2.18.1