Merge branch 'master' of https://git.steerinfo.com/DAL-DAZHOU1/DAL-DAZHOU-BMSTRUCK-API

src/main/java/com/steerinfo/dil/mapper/BmstruckDetailsOrderMapper.java

@@ -184,6 +184,8 @@ public interface BmstruckDetailsOrderMapper extends IBaseMapper<BmstruckDetailsO
 
     List<BigDecimal> getDetailIds(BigDecimal orderId);
 
+    BigDecimal getDetailAmount(BigDecimal orderId);
+
     int updatePlace(Map<String, Object> mapValue);
 
     int updateDetailsStatus(Integer orderId);

src/main/java/com/steerinfo/dil/model/BmstruckDetailsOrder.java

@@ -105,6 +105,20 @@ public class BmstruckDetailsOrder implements IBasePO<BigDecimal> {
     @ApiModelProperty(value="单价IDS",required=false)
     private String priceids;
 
+    /**
+     *修改前的运费
+     */
+    @ApiModelProperty(value="修改前的运费",required=false)
+    private BigDecimal historyDetailsAmount;
+
+    public BigDecimal getHistoryDetailsAmount() {
+        return historyDetailsAmount;
+    }
+
+    public void setHistoryDetailsAmount(BigDecimal historyDetailsAmount) {
+        this.historyDetailsAmount = historyDetailsAmount;
+    }
+
     public String getPriceids() {
         return priceids;
     }

src/main/java/com/steerinfo/dil/service/impl/BmstruckDetailsOrderServiceImpl.java

@@ -561,6 +561,7 @@ public class BmstruckDetailsOrderServiceImpl implements IBmstruckDetailsOrderSer
             }catch (Exception e){
                 System.out.println("更新历史时间失败");
             }
+            bmstruckDetailsOrder.setHistoryDetailsAmount(DataChange.dataToBigDecimal(mapValue.get("detailsAmount")));
             result = bmstruckDetailsOrderMapper.updateByPrimaryKeySelective(bmstruckDetailsOrder);
         }
         try {

src/main/resources/com/steerinfo/dil/mapper/BmstruckDetailsOrderMapper.xml

@@ -18,16 +18,17 @@
         <result column="EAS_AMOUNT" jdbcType="DECIMAL" property="easAmount" />
         <result column="ORDER_ID" jdbcType="DECIMAL" property="orderId" />
         <result column="PRICEIDS" jdbcType="VARCHAR" property="priceids"/>
+        <result column="HISTORY_DETAILS_AMOUNT" jdbcType="DECIMAL" property="historyDetailsAmount"></result>
     </resultMap>
     <sql id="columns">
         DETAILS_ID, PURCHASE_ORDER_ID, WEIGHT_TASK_RESULT_ID, DETAILS_NO, DETAILS_TIME, PRICE_ID, 
     DETAILS_AMOUNT, INSERT_USERNAME, INSERT_TIME, UPDATE_USERNAME, UPDATE_TIME, INSERT_UPDATE_REMARK, 
-    WETHER_TO_STATEMENT, EAS_AMOUNT, ORDER_ID
+    WETHER_TO_STATEMENT, EAS_AMOUNT, ORDER_ID, HISTORY_DETAILS_AMOUNT
     </sql>
     <sql id="columns_alias">
         t.DETAILS_ID, t.PURCHASE_ORDER_ID, t.WEIGHT_TASK_RESULT_ID, t.DETAILS_NO, t.DETAILS_TIME, 
     t.PRICE_ID, t.DETAILS_AMOUNT, t.INSERT_USERNAME, t.INSERT_TIME, t.UPDATE_USERNAME, 
-    t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.WETHER_TO_STATEMENT, t.EAS_AMOUNT, t.ORDER_ID
+    t.UPDATE_TIME, t.INSERT_UPDATE_REMARK, t.WETHER_TO_STATEMENT, t.EAS_AMOUNT, t.ORDER_ID ,t.HISTORY_DETAILS_AMOUNT
     </sql>
     <sql id="select">
         SELECT <include refid="columns" /> FROM BMSTRUCK_DETAILS_ORDER
@@ -358,7 +359,10 @@
                 ORDER_ID = #{orderId,jdbcType=DECIMAL},
             </if>
             <if test="priceids !=null">
-                PRICEIDS = #{priceids,jdbcType=VARCHAR}
+                PRICEIDS = #{priceids,jdbcType=VARCHAR},
+            </if>
+            <if test="historyDetailsAmount !=null">
+                HISTORY_DETAILS_AMOUNT =#{historyDetailsAmount,jdbcType=DECIMAL}
             </if>
         </set>
         where DETAILS_ID = #{detailsId,jdbcType=DECIMAL}
@@ -2314,6 +2318,10 @@
         SELECT BDO.DETAILS_ID "detailId" FROM BMSTRUCK_DETAILS_ORDER BDO
         WHERE BDO.ORDER_ID = #{orderId}
     </select>
+    <select id="getDetailAmount" resultType="java.math.BigDecimal" parameterType="decimal">
+        SELECT BDO.DETAILS_AMOUNT "detailsAmount" FROM BMSTRUCK_DETAILS_ORDER BDO
+        WHERE BDO.ORDER_ID = #{orderId} and rownum=1
+    </select>
     <update id="updatePlace" parameterType="map">
         update AMS_SALE_ORDER_MATERIAL ASOM
         set asom.SALE_SHIPPING_ADDRESS_ID = #{placeId}