Browse Source

订单审核负责人开发

anderx 3 years ago
parent
commit
291b62dd70

+ 17 - 6
src/main/java/com/goafanti/common/mapper/NewOrderChangeMapper.xml

@@ -36,6 +36,7 @@
     <result column="attachment_url" jdbcType="VARCHAR" property="attachmentUrl" />
     <result column="contract_picture_url" jdbcType="VARCHAR" property="contractPictureUrl" />
     <result column="first_amount" jdbcType="DECIMAL" property="firstAmount" />
+    <result column="examine_name" jdbcType="VARCHAR" property="examineName" />
   </resultMap>
   <sql id="Base_Column_List">
     id, order_no, process_state, `status`, `type`, create_time, remarks, voucher_url,
@@ -43,7 +44,7 @@
     zxs_cost, zxs_remarks, payment_time, payment_amount, invoice_time, invoice_amount,
     invoice_type, cw_cost, refundable_amount, cw_remarks, estimate_cost, estimate_refundable,
     refund_Invoice, used_order, refund_status, refund_url, back_status, attachment_url,
-    contract_picture_url, first_amount
+    contract_picture_url, first_amount, examine_name
   </sql>
   <select id="selectByPrimaryKey" parameterType="java.lang.Integer" resultMap="BaseResultMap">
     select
@@ -66,8 +67,8 @@
       refundable_amount, cw_remarks, estimate_cost,
       estimate_refundable, refund_Invoice, used_order,
       refund_status, refund_url, back_status,
-      attachment_url, contract_picture_url, first_amount
-      )
+      attachment_url, contract_picture_url, first_amount,
+      examine_name)
     values (#{orderNo,jdbcType=VARCHAR}, #{processState,jdbcType=INTEGER}, #{status,jdbcType=INTEGER},
       #{type,jdbcType=INTEGER}, #{createTime,jdbcType=TIMESTAMP}, #{remarks,jdbcType=VARCHAR},
       #{voucherUrl,jdbcType=VARCHAR}, #{totalAmount,jdbcType=DECIMAL}, #{settlementAmount,jdbcType=DECIMAL},
@@ -78,8 +79,8 @@
       #{refundableAmount,jdbcType=DECIMAL}, #{cwRemarks,jdbcType=VARCHAR}, #{estimateCost,jdbcType=DECIMAL},
       #{estimateRefundable,jdbcType=DECIMAL}, #{refundInvoice,jdbcType=DECIMAL}, #{usedOrder,jdbcType=VARCHAR},
       #{refundStatus,jdbcType=INTEGER}, #{refundUrl,jdbcType=VARCHAR}, #{backStatus,jdbcType=INTEGER},
-      #{attachmentUrl,jdbcType=VARCHAR}, #{contractPictureUrl,jdbcType=VARCHAR}, #{firstAmount,jdbcType=DECIMAL}
-      )
+      #{attachmentUrl,jdbcType=VARCHAR}, #{contractPictureUrl,jdbcType=VARCHAR}, #{firstAmount,jdbcType=DECIMAL},
+      #{examineName,jdbcType=VARCHAR})
   </insert>
   <insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.goafanti.common.model.NewOrderChange" useGeneratedKeys="true">
     insert into new_order_change
@@ -183,6 +184,9 @@
       <if test="firstAmount != null">
         first_amount,
       </if>
+      <if test="examineName != null">
+        examine_name,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="orderNo != null">
@@ -284,6 +288,9 @@
       <if test="firstAmount != null">
         #{firstAmount,jdbcType=DECIMAL},
       </if>
+      <if test="examineName != null">
+        #{examineName,jdbcType=VARCHAR},
+      </if>
     </trim>
   </insert>
   <update id="updateByPrimaryKeySelective" parameterType="com.goafanti.common.model.NewOrderChange">
@@ -388,6 +395,9 @@
       <if test="firstAmount != null">
         first_amount = #{firstAmount,jdbcType=DECIMAL},
       </if>
+      <if test="examineName != null">
+        examine_name = #{examineName,jdbcType=VARCHAR},
+      </if>
     </set>
     where id = #{id,jdbcType=INTEGER}
   </update>
@@ -425,7 +435,8 @@
       back_status = #{backStatus,jdbcType=INTEGER},
       attachment_url = #{attachmentUrl,jdbcType=VARCHAR},
       contract_picture_url = #{contractPictureUrl,jdbcType=VARCHAR},
-      first_amount = #{firstAmount,jdbcType=DECIMAL}
+      first_amount = #{firstAmount,jdbcType=DECIMAL},
+      examine_name = #{examineName,jdbcType=VARCHAR}
     where id = #{id,jdbcType=INTEGER}
   </update>
   <select id="selectByorderNo" resultType="com.goafanti.order.bo.NewOrderChangeBo">

+ 13 - 0
src/main/java/com/goafanti/common/model/NewOrderChange.java

@@ -179,6 +179,11 @@ public class NewOrderChange implements Serializable {
      */
     private BigDecimal firstAmount;
 
+    /**
+     * 审核人员名称
+     */
+    private String examineName;
+
     private static final long serialVersionUID = 1L;
 
     public Integer getId() {
@@ -452,4 +457,12 @@ public class NewOrderChange implements Serializable {
     public void setFirstAmount(BigDecimal firstAmount) {
         this.firstAmount = firstAmount;
     }
+
+    public String getExamineName() {
+        return examineName;
+    }
+
+    public void setExamineName(String examineName) {
+        this.examineName = examineName;
+    }
 }