Browse Source

订单变更BUG修复

anderx 3 years ago
parent
commit
a80a99e3ca

+ 3 - 1
src/main/java/com/goafanti/common/dao/TOrderHighTechMapper.java

@@ -14,4 +14,6 @@ public interface TOrderHighTechMapper {
     int updateByPrimaryKeySelective(TOrderHighTech record);
 
     int updateByPrimaryKey(TOrderHighTech record);
-}
+
+    int updateByOrder(TOrderHighTech tighTech);
+}

+ 27 - 14
src/main/java/com/goafanti/common/mapper/TOrderHighTechMapper.xml

@@ -13,11 +13,11 @@
     <result column="create_time" jdbcType="TIMESTAMP" property="createTime" />
   </resultMap>
   <sql id="Base_Column_List">
-    id, order_no, knowledge_services, audit_services, add_deduction_services, knowledge_other, 
+    id, order_no, knowledge_services, audit_services, add_deduction_services, knowledge_other,
     audit_other, add_deduction_other, create_time
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
-    select 
+    select
     <include refid="Base_Column_List" />
     from t_order_high_tech
     where id = #{id,jdbcType=INTEGER}
@@ -27,11 +27,11 @@
     where id = #{id,jdbcType=INTEGER}
   </delete>
   <insert id="insert" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.TOrderHighTech" useGeneratedKeys="true">
-    insert into t_order_high_tech (order_no, knowledge_services, audit_services, 
-      add_deduction_services, knowledge_other, audit_other, 
+    insert into t_order_high_tech (order_no, knowledge_services, audit_services,
+      add_deduction_services, knowledge_other, audit_other,
       add_deduction_other, create_time)
-    values (#{orderNo,jdbcType=VARCHAR}, #{knowledgeServices,jdbcType=INTEGER}, #{auditServices,jdbcType=INTEGER}, 
-      #{addDeductionServices,jdbcType=INTEGER}, #{knowledgeOther,jdbcType=VARCHAR}, #{auditOther,jdbcType=VARCHAR}, 
+    values (#{orderNo,jdbcType=VARCHAR}, #{knowledgeServices,jdbcType=INTEGER}, #{auditServices,jdbcType=INTEGER},
+      #{addDeductionServices,jdbcType=INTEGER}, #{knowledgeOther,jdbcType=VARCHAR}, #{auditOther,jdbcType=VARCHAR},
       #{addDeductionOther,jdbcType=VARCHAR}, #{createTime,jdbcType=TIMESTAMP})
   </insert>
   <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.TOrderHighTech" useGeneratedKeys="true">
@@ -122,13 +122,26 @@
   <update id="updateByPrimaryKey" parameterType="com.goafanti.common.model.TOrderHighTech">
     update t_order_high_tech
     set order_no = #{orderNo,jdbcType=VARCHAR},
-      knowledge_services = #{knowledgeServices,jdbcType=INTEGER},
-      audit_services = #{auditServices,jdbcType=INTEGER},
-      add_deduction_services = #{addDeductionServices,jdbcType=INTEGER},
-      knowledge_other = #{knowledgeOther,jdbcType=VARCHAR},
-      audit_other = #{auditOther,jdbcType=VARCHAR},
-      add_deduction_other = #{addDeductionOther,jdbcType=VARCHAR},
-      create_time = #{createTime,jdbcType=TIMESTAMP}
+    knowledge_services = #{knowledgeServices,jdbcType=INTEGER},
+    audit_services = #{auditServices,jdbcType=INTEGER},
+    add_deduction_services = #{addDeductionServices,jdbcType=INTEGER},
+    knowledge_other = #{knowledgeOther,jdbcType=VARCHAR},
+    audit_other = #{auditOther,jdbcType=VARCHAR},
+    add_deduction_other = #{addDeductionOther,jdbcType=VARCHAR},
+    create_time = #{createTime,jdbcType=TIMESTAMP}
     where id = #{id,jdbcType=INTEGER}
   </update>
-</mapper>
+
+  <update id="updateByOrder" parameterType="com.goafanti.common.model.TOrderHighTech">
+    update t_order_high_tech
+    set
+    knowledge_services = #{knowledgeServices,jdbcType=INTEGER},
+    audit_services = #{auditServices,jdbcType=INTEGER},
+    add_deduction_services = #{addDeductionServices,jdbcType=INTEGER},
+    knowledge_other = #{knowledgeOther,jdbcType=VARCHAR},
+    audit_other = #{auditOther,jdbcType=VARCHAR},
+    add_deduction_other = #{addDeductionOther,jdbcType=VARCHAR},
+    create_time = #{createTime,jdbcType=TIMESTAMP}
+    where order_no = #{orderNo,jdbcType=VARCHAR}
+  </update>
+</mapper>

+ 1 - 1
src/main/java/com/goafanti/order/service/impl/OrderNewServiceImpl.java

@@ -471,7 +471,7 @@ public class OrderNewServiceImpl extends BaseMybatisDao<TOrderNewMapper> impleme
 			tighTech.setKnowledgeOther(t.getKnowledgeOther());
 			tighTech.setAuditOther(t.getAuditOther());
 			tighTech.setAddDeductionOther(t.getAddDeductionOther());
-			int i=tOrderHighTechMapper.updateByPrimaryKey(tighTech);
+			int i=tOrderHighTechMapper.updateByOrder(tighTech);
 			if(i==0){
 				tOrderHighTechMapper.insertSelective(tighTech);
 			}