修改bug文档问题

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/BackGoods.java

@@ -38,6 +38,8 @@ public class BackGoods  implements Serializable {
 
     private String backGoodsAlipay;             //转账账户
 
+    private String backGoodsAlipayName;             //转账账户姓名
+
     private Integer backGoodsIsTransfer;        //是否已转账邮费  0:不需要 1:已转  2:待转
 
     private Date backGoodsCreateTime;
@@ -232,4 +234,12 @@ public class BackGoods  implements Serializable {
     public void setBackGoodsUpdateTime(Date backGoodsUpdateTime) {
         this.backGoodsUpdateTime = backGoodsUpdateTime;
     }
+
+    public String getBackGoodsAlipayName() {
+        return backGoodsAlipayName;
+    }
+
+    public void setBackGoodsAlipayName(String backGoodsAlipayName) {
+        this.backGoodsAlipayName = backGoodsAlipayName;
+    }
 }

watero-rst-core/src/main/java/com.iamberry.rst.core/cm/NoreasonBack.java

@@ -37,6 +37,7 @@ public class NoreasonBack  implements Serializable {
     private Integer noreasonBackState;
 
     private String noreasonBackAlipay;          //转账账户
+    private String noreasonBackAlipayName;          //转账账户姓名
 
     private Integer noreasonBackIsTransfer;     //是否已转账邮费  0:不需要 1:已转  2:待转
 
@@ -232,4 +233,12 @@ public class NoreasonBack  implements Serializable {
     public void setNoreasonBackIsTransfer(Integer noreasonBackIsTransfer) {
         this.noreasonBackIsTransfer = noreasonBackIsTransfer;
     }
+
+    public String getNoreasonBackAlipayName() {
+        return noreasonBackAlipayName;
+    }
+
+    public void setNoreasonBackAlipayName(String noreasonBackAlipayName) {
+        this.noreasonBackAlipayName = noreasonBackAlipayName;
+    }
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/backGoodsMapper.xml

@@ -19,12 +19,13 @@
     <result column="back_goods_is_transfer" property="backGoodsIsTransfer" jdbcType="BIT" />
     <result column="back_goods_create_time" property="backGoodsCreateTime" jdbcType="TIMESTAMP" />
     <result column="back_goods_update_time" property="backGoodsUpdateTime" jdbcType="TIMESTAMP" />
+    <result column="back_goods_alipay_name" property="backGoodsAlipayName" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
     back_goods_id, customer_id, order_id, signclosed_id, back_goods_back_status, back_goods_back_name, 
     back_goods_back_tel, back_goods_back_logistics_company, back_goods_back_logistics_no, 
     back_goods_back_postage, back_goods_back_machine_no, back_goods_desc, back_goods_state, 
-    back_goods_alipay, back_goods_is_transfer, back_goods_create_time, back_goods_update_time
+    back_goods_alipay, back_goods_is_transfer, back_goods_create_time, back_goods_update_time,back_goods_alipay_name
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select 
@@ -67,6 +68,7 @@
       g.back_goods_is_transfer,
       g.back_goods_create_time,
       g.back_goods_update_time,
+      g.back_goods_alipay_name,
       o.sales_pay_time salesPayTime
     from
       tb_rst_back_goods g
@@ -99,6 +101,7 @@
     <result column="back_goods_is_transfer" property="backGoodsIsTransfer"/>
     <result column="back_goods_create_time" property="backGoodsCreateTime"/>
     <result column="back_goods_update_time" property="backGoodsUpdateTime"/>
+    <result column="back_goods_alipay_name" property="backGoodsAlipayName"/>
     <collection property="complaintDetectList" column="customer_id" ofType="ComplaintDetectInfo" select="listComplaintDetect"/>
   </resultMap>
 
@@ -312,6 +315,9 @@
       <if test="backGoodsUpdateTime != null" >
         back_goods_update_time = #{backGoodsUpdateTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="backGoodsAlipayName != null" >
+        back_goods_alipay_name = #{backGoodsAlipayName,jdbcType=VARCHAR},
+      </if>
     </set>
     where back_goods_id = #{backGoodsId,jdbcType=INTEGER}
   </update>

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/mapper/noreasonBackMapper.xml

@@ -19,13 +19,14 @@
     <result column="noreason_back_is_transfer" property="noreasonBackIsTransfer" jdbcType="BIT" />
     <result column="noreason_back_create_time" property="noreasonBackCreateTime" jdbcType="TIMESTAMP" />
     <result column="noreason_back_update_time" property="noreasonBackUpdateTime" jdbcType="TIMESTAMP" />
+    <result column="noreason_back_alipay_name" property="noreasonBackAlipayName" jdbcType="VARCHAR" />
   </resultMap>
   <sql id="Base_Column_List" >
     noreason_back_id, customer_id, order_id, signclosed_id, noreason_back_back_status, 
     noreason_back_back_name, noreason_back_back_tel, noreason_back_back_logistics_company, 
     noreason_back_back_logistics_no, noreason_back_back_postage, noreason_back_back_machine_no, 
     noreason_back_desc, noreason_back_state, noreason_back_alipay, noreason_back_is_transfer, 
-    noreason_back_create_time, noreason_back_update_time
+    noreason_back_create_time, noreason_back_update_time,noreason_back_alipay_name
   </sql>
   <select id="selectByPrimaryKey" resultMap="BaseResultMap" parameterType="java.lang.Integer" >
     select 
@@ -68,6 +69,7 @@
       b.noreason_back_is_transfer,
       b.noreason_back_create_time,
       b.noreason_back_update_time,
+      b.noreason_back_alipay_name,
       o.sales_pay_time salesPayTime
     from
       tb_rst_noreason_back b
@@ -100,6 +102,7 @@
     <result column="noreason_back_is_transfer" property="noreasonBackIsTransfer" jdbcType="BIT" />
     <result column="noreason_back_create_time" property="noreasonBackCreateTime" jdbcType="TIMESTAMP" />
     <result column="noreason_back_update_time" property="noreasonBackUpdateTime" jdbcType="TIMESTAMP" />
+    <result column="noreason_back_alipay_name" property="noreasonBackAlipayName" jdbcType="VARCHAR" />
     <collection property="complaintDetectList" column="customer_id" ofType="ComplaintDetectInfo" select="listComplaintDetect"/>
   </resultMap>
 
@@ -204,6 +207,9 @@
       <if test="noreasonBackUpdateTime != null" >
         noreason_back_update_time = #{noreasonBackUpdateTime},
       </if>
+      <if test="noreasonBackAlipayName != null" >
+        noreason_back_alipay_name = #{noreasonBackAlipayName},
+      </if>
     </set>
     where noreason_back_id = #{noreasonBackId}
   </update>
@@ -224,7 +230,8 @@
       noreason_back_alipay = #{noreasonBackAlipay,jdbcType=VARCHAR},
       noreason_back_is_transfer = #{noreasonBackIsTransfer,jdbcType=BIT},
       noreason_back_create_time = #{noreasonBackCreateTime,jdbcType=TIMESTAMP},
-      noreason_back_update_time = #{noreasonBackUpdateTime,jdbcType=TIMESTAMP}
+      noreason_back_update_time = #{noreasonBackUpdateTime,jdbcType=TIMESTAMP},
+      noreason_back_alipay_name = #{noreasonBackAlipayName,jdbcType=VARCHAR}
     where noreason_back_id = #{noreasonBackId,jdbcType=INTEGER}
   </update>
 </mapper>

watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/update_reissue.ftl

@@ -62,10 +62,18 @@
                     <input type="radio" id="tel-5" name="reissueSendStatus" value="3" seleType="send">
                     <label for="tel-5">已收货</label>
                 </div>
-                Efast订单号<input style="width: 231px;margin-left: 20px;" type="text" class="input-text" value="" placeholder="Efast订单号" id="reissueBackEfastOrderId" name="reissueBackEfastOrderId" seleType="send">
+
             </div>
         </div>
         </div>
+        <div class="row cl">
+              <div class="formControls col-2 col-sm-2 text-r">
+                <strong>Efast订单号</strong>
+              </div>
+              <div class="formControls col-5 col-sm-5">
+                 <input  type="text" class="input-text" value="" placeholder="Efast订单号" id="reissueBackEfastOrderId" name="reissueBackEfastOrderId" seleType="send">
+              </div>
+        </div>
         <div class="row cl" id="sendUserInfo">
             <div class="formControls col-2 col-sm-2 text-r">
                 <strong>用户信息</strong>

watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/update_renewed.ftl

@@ -188,9 +188,16 @@
                         <input type="radio" id="tel-12" name="renewedSendStatus" value="3" seleType="sendInformation">
                         <label for="tel-12">已收货</label>
                     </div>
-                    Efast订单号<input style="width: 231px;margin-left:20px;" type="text" class="input-text" value="" placeholder="Efast订单号" id="renewedBackEfastOrderId" name="renewedBackEfastOrderId" seleType="sendInformation">
                 </div>
-
+            </div>
+            <div class="row cl">
+                <div class="formControls col-2 col-sm-2 text-r">
+                    <strong>Efast订单号</strong>
+                </div>
+                <div class="formControls col-5 col-sm-5">
+                    <input type="text" class="input-text" value="" placeholder="Efast订单号" id="renewedBackEfastOrderId" name="renewedBackEfastOrderId" seleType="sendInformation">
+                </div>
+            </div>
                 <#--<div class="row cl">
                     <div class="formControls col-2 col-sm-2 text-r">
                         <strong>寄出产品</strong>
@@ -285,16 +292,14 @@
                         <input type="text" class="input-text" placeholder="寄出备注" id="renewedDesc" name="renewedDesc" seleType="sendInformation">
                     </div>
                 </div>
-            </div>
-
-            <div class="row cl">
-                <div class="formControls col-2 col-sm-2">
-                </div>
-                <div class="formControls col-8 col-sm-8 text-c">
-                    <button onClick="update_renewed_info(3);" class="btn btn-primary" type="button">确认修改</button>
+                <div class="row cl">
+                    <div class="formControls col-2 col-sm-2">
+                    </div>
+                    <div class="formControls col-8 col-sm-8 text-c">
+                        <button onClick="update_renewed_info(3);" class="btn btn-primary" type="button">确认修改</button>
+                    </div>
                 </div>
             </div>
-        </div>
         <div class="tabCon">
             <div class="row cl" style="margin-left: -70px;">
                 <div class="formControls col-2 col-sm-2 text-r">
@@ -326,7 +331,6 @@
         </div>
         <input type="hidden" id="customerId" name="customerId" value="${customerId!''}" seleType="primary">
     </form>
-    </div>
 </article>
 <script type="text/javascript" src="${path}/common/lib/My97DatePicker/4.8/WdatePicker.js"></script>
 <script type="text/javascript" src="${path}/common/lib/icheck/jquery.icheck.min.js"></script>

watero-rst-web/src/main/webapp/WEB-INF/views/cm/customer/update_repair.ftl

@@ -188,9 +188,16 @@
                             <input type="radio" id="tel-12" name="repairSendStatus" value="3" seleType="sendInformation">
                             <label for="tel-12">已收货</label>
                         </div>
-                        Efast订单号<input style="width: 231px;margin-left:20px;" type="text" class="input-text" value="" placeholder="Efast订单号" id="repairBackEfastOrderId" name="repairBackEfastOrderId" seleType="sendInformation">
                     </div>
-
+                </div>
+                <div class="row cl">
+                    <div class="formControls col-2 col-sm-2 text-r">
+                        <strong>Efast订单号</strong>
+                    </div>
+                    <div class="formControls col-5 col-sm-5">
+                        <input type="text" class="input-text" value="" placeholder="Efast订单号" id="repairBackEfastOrderId" name="repairBackEfastOrderId" seleType="sendInformation">
+                    </div>
+                </div>
                 <#--<div class="row cl">
                     <div class="formControls col-2 col-sm-2 text-r">
                         <strong>寄出产品</strong>
@@ -285,16 +292,14 @@
                             <input type="text" class="input-text" placeholder="寄出备注" id="repairDesc" name="repairDesc" seleType="sendInformation">
                         </div>
                     </div>
-                </div>
-
-                <div class="row cl">
-                    <div class="formControls col-2 col-sm-2">
-                    </div>
-                    <div class="formControls col-8 col-sm-8 text-c">
-                        <button onClick="update_repair_info(3);" class="btn btn-primary" type="button">确认修改</button>
+                    <div class="row cl">
+                        <div class="formControls col-2 col-sm-2">
+                        </div>
+                        <div class="formControls col-8 col-sm-8 text-c">
+                            <button onClick="update_repair_info(3);" class="btn btn-primary" type="button">确认修改</button>
+                        </div>
                     </div>
                 </div>
-            </div>
             <div class="tabCon">
                 <div class="row cl" style="margin-left: -70px;">
                     <div class="formControls col-2 col-sm-2 text-r">
@@ -326,7 +331,6 @@
         </div>
         <input type="hidden" id="customerId" name="customerId" value="${customerId!''}" seleType="primary">
     </form>
-    </div>
 </article>
 <script type="text/javascript" src="${path}/common/lib/My97DatePicker/4.8/WdatePicker.js"></script>
 <script type="text/javascript" src="${path}/common/lib/icheck/jquery.icheck.min.js"></script>