Browse Source

修改获取id

anderx 5 years ago
parent
commit
fc69af6752

+ 5 - 6
src/main/java/com/goafanti/common/mapper/TOrderTaskMapper.xml

@@ -247,12 +247,8 @@
       #{consultantId,jdbcType=VARCHAR}, #{managerId,jdbcType=VARCHAR}, #{outsource,jdbcType=INTEGER}, 
       #{attachmentUrl,jdbcType=LONGVARCHAR})
   </insert>
-  <insert id="insertSelective" parameterType="com.goafanti.common.model.TOrderTask">
-    <!--
-      WARNING - @mbg.generated
-      This element is automatically generated by MyBatis Generator, do not modify.
-      This element was generated on Thu Mar 05 14:35:19 CST 2020.
-    -->
+  <insert id="insertSelective" parameterType="com.goafanti.common.model.TOrderTask" useGeneratedKeys="true" keyColumn="id" keyProperty="id">
+    
     insert into t_order_task
     <trim prefix="(" suffix=")" suffixOverrides=",">
       <if test="id != null">
@@ -480,6 +476,9 @@
         #{attachmentUrl,jdbcType=LONGVARCHAR},
       </if>
     </trim>
+    <selectKey resultType="int" keyProperty="id" order="AFTER">
+        SELECT LAST_INSERT_ID()
+    </selectKey>
   </insert>
   <select id="countByExample" parameterType="com.goafanti.common.model.TOrderTaskExample" resultType="java.lang.Long">
     <!--

+ 4 - 4
src/main/java/com/goafanti/order/service/impl/OrderBillServiceImpl.java

@@ -85,12 +85,12 @@ public class OrderBillServiceImpl extends BaseMybatisDao<TOrderBillNewMapper> im
 		TOrderNew o2=new TOrderNew();
 		o2.setOrderNo(o.getOrderNo());
 		o2.setSettlementAmount(o.getSettlementAmount().subtract(tbn.getTransactionAmount()));
-		if(o2.getSettlementAmount().compareTo(o2.getFirstAmount())== -1) {
+		if(o2.getSettlementAmount().compareTo(o.getFirstAmount())== -1) {
 			o2.setLiquidationStatus(LiquidationNewState.WAIT_PAY_FIRST_BALANCE.getCode());
-		}else if(o2.getSettlementAmount().compareTo(o2.getFirstAmount())==0&&
-				o2.getSettlementAmount().compareTo(o2.getTotalAmount())== -1) {
+		}else if(o2.getSettlementAmount().compareTo(o.getFirstAmount())> -1&&
+				o2.getSettlementAmount().compareTo(o.getTotalAmount())== -1) {
 			o2.setLiquidationStatus(LiquidationNewState.WAIT_PAY_LAST_BALANCE.getCode());
-		}else if(o2.getSettlementAmount().compareTo(o2.getTotalAmount())== 0) {
+		}else if(o2.getSettlementAmount().compareTo(o.getTotalAmount())== 0) {
 			o2.setLiquidationStatus(LiquidationNewState.ALREADY_PAY.getCode());
 		}
 		tOrderNewMapper.updateByPrimaryKeySelective(o2);

+ 0 - 2
src/main/java/com/goafanti/order/service/impl/OrderChangeServiceImpl.java

@@ -543,8 +543,6 @@ public class OrderChangeServiceImpl extends BaseMybatisDao<NewOrderChangeMapper>
 	public int pushCompleteOrderChange(NewOrderChangeBo nb) {
 		//变更完成
 		changeAdopt(nb);
-		//新增退款金额
-		//addOrderRefund(nb);
 		TOrderNew o=pushChange(nb);
 		List<String> alist = new ArrayList<>();
 		alist.add(o.getSalesmanId());