修正续费日期更新及分配更新错误

ie-system/src/main/java/com/ruoyi/dz/mapper/DzCardsMapper.java

@@ -50,6 +50,8 @@ public interface DzCardsMapper
      */
     public int updateDzCards(DzCards dzCards);
 
+    public int updateDzCardsWithAssign(DzCards dzCards);
+
     public int updateDzCardsByNo(DzCards dzCards);
     /**
      * 删除学习卡

ie-system/src/main/java/com/ruoyi/dz/service/impl/DzCardsServiceImpl.java

@@ -292,7 +292,7 @@ public class DzCardsServiceImpl implements IDzCardsService
             // dzCards.setStatus(CardStatus.Open.getVal());
             dzCards.setOpenTime(DateUtils.getNowDate());
             dzCards.setDays(days);
-            dzCardsMapper.updateDzCards(dzCards);
+            dzCardsMapper.updateDzCardsWithAssign(dzCards);
         });
     }
 
@@ -336,7 +336,7 @@ public class DzCardsServiceImpl implements IDzCardsService
                 dzCards.setLeafAgentId(dzAgent.getAgentId());
             }
             dzCards.setDays(days);
-            dzCardsMapper.updateDzCards(dzCards);
+            dzCardsMapper.updateDzCardsWithAssign(dzCards);
         });
         // TODO MF 检查已经使用的或无效的
         return true;
@@ -398,7 +398,7 @@ public class DzCardsServiceImpl implements IDzCardsService
                 dzCards.setPayStatus(PayStatus.Paid.getVal());
                 // dzCards.setStatus(CardStatus.Paid.getVal());
                 dzCards.setDistributeStatus(CardDistributeStatus.Assign.getVal());
-                dzCardsMapper.updateDzCards(dzCards);
+                dzCardsMapper.updateDzCardsWithAssign(dzCards);
             });
         }
         dzCardsOpenMapper.updateDzCardsOpen(upOpen);
@@ -448,7 +448,7 @@ public class DzCardsServiceImpl implements IDzCardsService
         for(DzCards card : cards) {
             up.setCardId(card.getCardId());
             if(CardAction.Renew.equals(action)) {
-                card.setOutDate(DateUtils.addYears(card.getOutDate(), 3)); // TODO 暂时都续费三年？
+                up.setOutDate(DateUtils.addYears(card.getOutDate(), 3)); // TODO 暂时都续费三年？
             }
             dzCardsMapper.updateDzCards(up);
         }

ie-system/src/main/resources/mapper/dz/DzCardsMapper.xml

@@ -250,6 +250,46 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </insert>
 
     <update id="updateDzCards" parameterType="DzCards">
+        update dz_cards
+        <trim prefix="SET" suffixOverrides=",">
+            <if test="cardNo != null">card_no = #{cardNo},</if>
+            <if test="password != null">password = #{password},</if>
+            <if test="type != null">type = #{type},</if>
+            <if test="status != null">status = #{status},</if>
+            <if test="distributeStatus != null">distribute_status = #{distributeStatus},</if>
+            <if test="timeStatus != null">time_status = #{timeStatus},</if>
+            <if test="payStatus != null">pay_status = #{payStatus},</if>
+            <if test="isSettlement != null">is_settlement = #{isSettlement},</if>
+            <if test="deptId != null">dept_id = #{deptId},</if>
+            <if test="agentId != null">agent_id = #{agentId},</if>
+            <if test="leafAgentId != null">leaf_agent_id = #{leafAgentId},</if>
+            <if test="campusId != null">campus_id = #{campusId},</if>
+            <if test="campusClassId != null">campus_class_id = #{campusClassId},</if>
+            <if test="assignLocation != null">assign_location = #{assignLocation},</if>
+            <if test="assignExamType != null">assign_exam_type = #{assignExamType},</if>
+            <if test="assignSchoolId != null">assign_school_id = #{assignSchoolId},</if>
+            <if test="schoolId != null">school_id = #{schoolId},</if>
+            <if test="classId != null">class_id = #{classId},</if>
+            <if test="year != null">year = #{year},</if>
+            <if test="endYear != null">end_year = #{endYear},</if>
+            <if test="openId != null">open_id = #{openId},</if>
+            <if test="remark != null">remark = #{remark},</if>
+            <if test="distributeTime != null">distribute_time = #{distributeTime},</if>
+            <if test="outDate != null">out_date = #{outDate},</if>
+            <if test="openTime != null">open_time = #{openTime},</if>
+            <if test="payTime != null">pay_time = #{payTime},</if>
+            <if test="activeTime != null">active_time = #{activeTime},</if>
+            <if test="days != null">days = #{days},</if>
+            <if test="settlementTime != null">settlement_time = #{settlementTime},</if>
+            <if test="refundTime != null">refund_time = #{refundTime},</if>
+            <if test="closeTime != null">close_time = #{closeTime},</if>
+            <if test="createTime != null">create_time = #{createTime},</if>
+            <if test="updateTime != null">update_time = #{updateTime},</if>
+        </trim>
+        where card_id = #{cardId}
+    </update>
+
+    <update id="updateDzCardsWithAssign" parameterType="DzCards">
         update dz_cards
         <trim prefix="SET" suffixOverrides=",">
             <if test="cardNo != null">card_no = #{cardNo},</if>