客诉列表修改

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

@@ -0,0 +1,111 @@
+package com.iamberry.rst.core.cm;
+
+import java.io.Serializable;
+import java.util.Date;
+import java.util.List;
+
+/**
+ * Created by Administrator on 2019/1/23.
+ */
+public class SendbackInfo implements Serializable {
+    private static final long serialVersionUID = -8656273134485720766L;
+    private Integer sendbackId;//
+    private Integer relationId;//处理主键
+    private String sendbackLogisticsCompany;//物流公司
+    private String sendbackLogisticsNo;//物流单号
+    private String sendbackName;//寄回人姓名
+    private String sendbackTel;//寄回人电话
+    private Integer sendbackStatus;//寄回状态 1.未配送2.配送中3.已签收
+    private Date sendbackCreateTime;//创建时间
+    private Date sendbackUpdateTime;//创建时间
+    private Date sendbackSignTime;//签收时间
+    private List<SendbackItem> listSendbackItem;
+
+    public Integer getSendbackId() {
+        return sendbackId;
+    }
+
+    public void setSendbackId(Integer sendbackId) {
+        this.sendbackId = sendbackId;
+    }
+
+    public Integer getRelationId() {
+        return relationId;
+    }
+
+    public void setRelationId(Integer relationId) {
+        this.relationId = relationId;
+    }
+
+    public String getSendbackLogisticsCompany() {
+        return sendbackLogisticsCompany;
+    }
+
+    public void setSendbackLogisticsCompany(String sendbackLogisticsCompany) {
+        this.sendbackLogisticsCompany = sendbackLogisticsCompany;
+    }
+
+    public String getSendbackLogisticsNo() {
+        return sendbackLogisticsNo;
+    }
+
+    public void setSendbackLogisticsNo(String sendbackLogisticsNo) {
+        this.sendbackLogisticsNo = sendbackLogisticsNo;
+    }
+
+    public String getSendbackName() {
+        return sendbackName;
+    }
+
+    public void setSendbackName(String sendbackName) {
+        this.sendbackName = sendbackName;
+    }
+
+    public String getSendbackTel() {
+        return sendbackTel;
+    }
+
+    public void setSendbackTel(String sendbackTel) {
+        this.sendbackTel = sendbackTel;
+    }
+
+    public Integer getSendbackStatus() {
+        return sendbackStatus;
+    }
+
+    public void setSendbackStatus(Integer sendbackStatus) {
+        this.sendbackStatus = sendbackStatus;
+    }
+
+    public Date getSendbackCreateTime() {
+        return sendbackCreateTime;
+    }
+
+    public void setSendbackCreateTime(Date sendbackCreateTime) {
+        this.sendbackCreateTime = sendbackCreateTime;
+    }
+
+    public Date getSendbackUpdateTime() {
+        return sendbackUpdateTime;
+    }
+
+    public void setSendbackUpdateTime(Date sendbackUpdateTime) {
+        this.sendbackUpdateTime = sendbackUpdateTime;
+    }
+
+    public List<SendbackItem> getListSendbackItem() {
+        return listSendbackItem;
+    }
+
+    public void setListSendbackItem(List<SendbackItem> listSendbackItem) {
+        this.listSendbackItem = listSendbackItem;
+    }
+
+    public Date getSendbackSignTime() {
+        return sendbackSignTime;
+    }
+
+    public void setSendbackSignTime(Date sendbackSignTime) {
+        this.sendbackSignTime = sendbackSignTime;
+    }
+}

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

@@ -0,0 +1,73 @@
+package com.iamberry.rst.core.cm;
+
+import java.io.Serializable;
+
+/**
+ * Created by Administrator on 2019/1/23.
+ */
+public class SendbackItem implements Serializable {
+    private static final long serialVersionUID = -7647058893919639691L;
+    private Integer sendbackItemId;//
+    private Integer sendbackId;//寄回信息主键
+    private Integer sendbackProductId;//寄回产品id
+    private Integer sendbackColorId;//寄回产品颜色id
+    private Integer sendbackProdcueNumber;//数量
+    private String sendbackProductName;//寄回产品id
+    private String sendbackColorName;//寄回产品颜色名称
+
+    public Integer getSendbackItemId() {
+        return sendbackItemId;
+    }
+
+    public void setSendbackItemId(Integer sendbackItemId) {
+        this.sendbackItemId = sendbackItemId;
+    }
+
+    public Integer getSendbackId() {
+        return sendbackId;
+    }
+
+    public void setSendbackId(Integer sendbackId) {
+        this.sendbackId = sendbackId;
+    }
+
+    public Integer getSendbackProductId() {
+        return sendbackProductId;
+    }
+
+    public void setSendbackProductId(Integer sendbackProductId) {
+        this.sendbackProductId = sendbackProductId;
+    }
+
+    public Integer getSendbackColorId() {
+        return sendbackColorId;
+    }
+
+    public void setSendbackColorId(Integer sendbackColorId) {
+        this.sendbackColorId = sendbackColorId;
+    }
+
+    public Integer getSendbackProdcueNumber() {
+        return sendbackProdcueNumber;
+    }
+
+    public void setSendbackProdcueNumber(Integer sendbackProdcueNumber) {
+        this.sendbackProdcueNumber = sendbackProdcueNumber;
+    }
+
+    public String getSendbackProductName() {
+        return sendbackProductName;
+    }
+
+    public void setSendbackProductName(String sendbackProductName) {
+        this.sendbackProductName = sendbackProductName;
+    }
+
+    public String getSendbackColorName() {
+        return sendbackColorName;
+    }
+
+    public void setSendbackColorName(String sendbackColorName) {
+        this.sendbackColorName = sendbackColorName;
+    }
+}

watero-rst-interface/src/main/java/com/iamberry/rst/faces/cm/CustomerService.java

@@ -269,4 +269,54 @@ public interface CustomerService {
      * @return
      */
     String  synchronizePostageInfo();
+
+    /**
+     * 添加寄回信息
+     */
+    Integer addSendbackInfo(SendbackInfo sendbackInfo);
+
+    /**
+     * 添加寄回信息项集合
+     */
+    Integer addSendbackItemList(List<SendbackItem> list);
+
+    /**
+     * 查询单个寄回信息
+     */
+    SendbackInfo getSendbackInfo(Integer sendbackId);
+
+    /**
+     * 查询寄回信息集合
+     */
+    List<SendbackInfo> listSendbackInfo(Integer relationId);
+
+    /**
+     * 查询寄回信息项集合
+     */
+    List<SendbackItem> sendbackItemList(Integer sendbackId);
+
+    /**
+     * 修改寄回信息
+     */
+    Integer updateSendbackInfo(SendbackInfo sendbackInfo);
+
+    /**
+     * 修改寄回信息项
+     */
+    Integer updateSendbackItem(SendbackItem sendbackItem);
+
+    /**
+     * 删除寄回信息
+     */
+    Integer deleteSendbackInfo(Integer sendbackId);
+
+    /**
+     * 根据主键删除寄回信息项
+     */
+    Integer deleteSendbackItemById(Integer sendbackItemId);
+
+    /**
+     * 根据寄回信息主键删除所有寄回信息项
+     */
+    Integer deleteSendbackItemBySendbackId(Integer sendbackId);
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/cm/CustomerServiceImpl.java

@@ -1629,4 +1629,54 @@ public class CustomerServiceImpl implements CustomerService {
             }
         return "同步成功:"+num+"个，失败："+oum+"个";
     }
+
+    @Override
+    public Integer addSendbackInfo(SendbackInfo sendbackInfo) {
+        return customerService.addSendbackInfo(sendbackInfo);
+    }
+
+    @Override
+    public Integer addSendbackItemList(List<SendbackItem> list) {
+        return customerService.addSendbackItemList(list);
+    }
+
+    @Override
+    public SendbackInfo getSendbackInfo(Integer sendbackId) {
+        return customerService.getSendbackInfo(sendbackId);
+    }
+
+    @Override
+    public List<SendbackInfo> listSendbackInfo(Integer relationId) {
+        return customerService.listSendbackInfo(relationId);
+    }
+
+    @Override
+    public List<SendbackItem> sendbackItemList(Integer sendbackId) {
+        return customerService.sendbackItemList(sendbackId);
+    }
+
+    @Override
+    public Integer updateSendbackInfo(SendbackInfo sendbackInfo) {
+        return customerService.updateSendbackInfo(sendbackInfo);
+    }
+
+    @Override
+    public Integer updateSendbackItem(SendbackItem sendbackItem) {
+        return customerService.updateSendbackItem(sendbackItem);
+    }
+
+    @Override
+    public Integer deleteSendbackInfo(Integer sendbackId) {
+        return customerService.deleteSendbackInfo(sendbackId);
+    }
+
+    @Override
+    public Integer deleteSendbackItemById(Integer sendbackItemId) {
+        return customerService.deleteSendbackItemById(sendbackItemId);
+    }
+
+    @Override
+    public Integer deleteSendbackItemBySendbackId(Integer sendbackId) {
+        return customerService.deleteSendbackItemBySendbackId(sendbackId);
+    }
 }

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

@@ -146,4 +146,54 @@ public interface CustomerInfoMapper {
      */
     Integer  deletePostageInfo(Integer postageId);
 
+    /**
+     * 添加寄回信息
+     */
+   Integer addSendbackInfo(SendbackInfo sendbackInfo);
+
+    /**
+     * 添加寄回信息项集合
+     */
+   Integer addSendbackItemList(List<SendbackItem> list);
+
+    /**
+     * 查询单个寄回信息
+     */
+    SendbackInfo getSendbackInfo(Integer sendbackId);
+
+    /**
+     * 查询寄回信息集合
+     */
+    List<SendbackInfo> listSendbackInfo(Integer relationId);
+
+    /**
+     * 查询寄回信息项集合
+     */
+    List<SendbackItem> sendbackItemList(Integer sendbackId);
+
+    /**
+     * 修改寄回信息
+     */
+    Integer updateSendbackInfo(SendbackInfo sendbackInfo);
+
+    /**
+     * 修改寄回信息项
+     */
+    Integer updateSendbackItem(SendbackItem sendbackItem);
+
+    /**
+     * 删除寄回信息
+     */
+    Integer deleteSendbackInfo(Integer sendbackId);
+
+    /**
+     * 根据主键删除寄回信息项
+     */
+    Integer deleteSendbackItemById(Integer sendbackItemId);
+
+    /**
+     * 根据寄回信息主键删除所有寄回信息项
+     */
+    Integer deleteSendbackItemBySendbackId(Integer sendbackId);
+
 }

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

@@ -1090,4 +1090,145 @@ LEFT JOIN tb_rst_cm_proc_type cpt ON cpt.proc_type_id = cpm.proc_type_id
   <delete id="deletePostageInfo" parameterType="Integer">
     DELETE from tb_rst_postage_info WHERE postage_id = #{postageId}
   </delete>
+
+
+  
+  <insert id="addSendbackInfo" parameterType="SendbackInfo" keyProperty="sendbackId" useGeneratedKeys="true">
+      INSERT INTO tb_rst_cm_sendback_info
+      (
+        relation_id,
+        sendback_logistics_company,
+        sendback_logistics_no,
+        sendback_name,
+        sendback_tel,
+        sendback_status,
+        sendback_sign_time,
+        sendback_create_time
+      )
+       VALUES
+      ( #{relationId},
+        #{sendbackLogisticsCompany},
+        #{sendbackLogisticsNo},
+        #{sendbackName},
+        #{sendbackTel},
+        #{sendbackStatus},
+        #{sendbackSignTime},
+        NOW()
+      )
+  </insert>
+
+  <insert id="addSendbackItemList" parameterType="ArrayList">
+    INSERT INTO tb_rst_cm_sendback_item
+    (
+    sendback_id,
+    sendback_product_id,
+    sendback_color_id,
+    sendback_prodcue_number
+    )
+    VALUES
+    <foreach collection="list" item="item" separator=",">
+      (
+      #{item.sendbackId},#{item.sendbackProductId},#{item.sendbackColorId},#{item.sendbackProdcueNumber}
+      )
+    </foreach>
+  </insert>
+
+  <resultMap id="sendbackMap" type="SendbackInfo">
+    <id column="sendback_id" property="sendbackId"/>
+    <result column="relation_id" property="relationId"/>
+    <result column="sendback_logistics_company" property="sendbackLogisticsCompany"/>
+    <result column="sendback_logistics_no" property="sendbackLogisticsNo"/>
+    <result column="sendback_name" property="sendbackName"/>
+    <result column="sendback_tel" property="sendbackTel"/>
+    <result column="sendback_status" property="sendbackStatus"/>
+    <result column="sendback_sign_time" property="sendbackSignTime"/>
+    <result column="sendback_create_time" property="sendbackCreateTime"/>
+    <result column="sendback_update_time" property="sendbackUpdateTime"/>
+    <collection property="listSendbackItem" column="sendback_id" ofType="SendbackItem" select="sendbackItemList"/>
+  </resultMap>
+
+  <select id="getSendbackInfo" parameterType="Integer" resultMap="sendbackMap">
+    SELECT
+      sendback_id,
+      relation_id,
+      sendback_logistics_company,
+      sendback_logistics_no,
+      sendback_name,
+      sendback_tel,
+      sendback_status,
+      sendback_sign_time,
+      sendback_create_time,
+      sendback_update_time
+     from tb_rst_cm_sendback_info WHERE sendback_id = #{sendbackId}
+  </select>
+
+  <select id="listSendbackInfo" parameterType="Integer" resultMap="sendbackMap">
+    SELECT
+      sendback_id,
+      relation_id,
+      sendback_logistics_company,
+      sendback_logistics_no,
+      sendback_name,
+      sendback_tel,
+      sendback_status,
+      sendbackSignTime,
+      sendback_create_time,
+      sendback_update_time
+     from tb_rst_cm_sendback_info WHERE relation_id = #{relationId}
+  </select>
+
+  <select id="sendbackItemList" parameterType="Integer" resultType="SendbackItem">
+      select * from tb_rst_cm_sendback_item where sendback_id = #{sendbackId};
+  </select>
+
+  <update id="updateSendbackInfo" parameterType="SendbackInfo">
+    UPDATE tb_rst_cm_sendback_info
+    <set>
+      <if test="sendbackLogisticsCompany != null and sendbackLogisticsCompany != ''">
+        sendback_logistics_company = #{sendbackLogisticsCompany},
+      </if>
+      <if test="sendbackLogisticsNo != null and sendbackLogisticsNo != ''">
+        sendback_logistics_no = #{sendbackLogisticsNo},
+      </if>
+      <if test="sendbackName != null and sendbackName != ''">
+        sendback_name = #{sendbackName},
+      </if>
+      <if test="sendbackSignTime != null and sendbackSignTime != ''">
+        sendback_sign_time = #{sendbackSignTime},
+      </if>
+      <if test="sendbackTel != null and sendbackTel != ''">
+        sendback_tel = #{sendbackTel}
+      </if>
+    </set>
+    WHERE sendback_id = #{sendbackId}
+  </update>
+
+  <update id="updateSendbackItem" parameterType="SendbackItem">
+    UPDATE tb_rst_cm_sendback_item
+    <set>
+      <if test="sendbackProductId != null and sendbackProductId != ''">
+        sendback_product_id = #{sendbackProductId},
+      </if>
+      <if test="sendbackColorId != null and sendbackColorId != ''">
+        sendback_color_id = #{sendbackColorId},
+      </if>
+      <if test="sendbackProdcueNumber != null and sendbackProdcueNumber != ''">
+        sendback_prodcue_number = #{sendbackProdcueNumber},
+      </if>
+    </set>
+    WHERE sendback_item_id = #{sendbackItemId}
+  </update>
+
+  <delete id="deleteSendbackInfo" parameterType="Integer" >
+    DELETE FROM tb_rst_cm_sendback_info WHERE sendback_id = #{sendbackId}
+  </delete>
+
+  <delete id="deleteSendbackItemById" parameterType="Integer" >
+    DELETE FROM tb_rst_cm_sendback_item WHERE sendback_item_id = #{sendbackItemId}
+  </delete>
+
+  <delete id="deleteSendbackItemBySendbackId" parameterType="Integer" >
+    DELETE FROM tb_rst_cm_sendback_item WHERE sendback_id = #{sendbackId}
+  </delete>
+
 </mapper>

watero-rst-web/src/main/java/com/iamberry/rst/controllers/cm/AdminCustomerController.java

@@ -2041,8 +2041,8 @@ public class AdminCustomerController {
      * @param
      * @return
      */
-    @ResponseBody
-    @RequestMapping("/synchronize_PostageInfo")
+    /*@ResponseBody
+    @RequestMapping("/synchronize_PostageInfo")*/
     public ResponseJson synchronizePostageInfo(HttpServletRequest request){
            String msg = customerService.synchronizePostageInfo();
         return new ResponseJson(200, msg, 200);

watero-rst-web/src/main/resources/watero-rst-orm.xml

@@ -189,6 +189,8 @@
 		<typeAlias type="com.iamberry.rst.core.order.OrderWarehouse" alias="OrderWarehouse"/>
 		<typeAlias type="com.iamberry.rst.core.order.OrderWarehouseAdmin" alias="OrderWarehouseAdmin"/>
 		<typeAlias type="com.iamberry.rst.core.cm.PostageInfo" alias="PostageInfo"/>
+		<typeAlias type="com.iamberry.rst.core.cm.SendbackInfo" alias="SendbackInfo"/>
+		<typeAlias type="com.iamberry.rst.core.cm.SendbackItem" alias="SendbackItem"/>
 	</typeAliases>
 	<!-- PageHelper -->
 	<plugins>

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

@@ -153,7 +153,7 @@
                 <div class="formControls col-2 col-sm-2 text-r">
                     <strong>邮费信息</strong>
                 </div>
-                <div class="formControls col-8 col-sm-8">
+                <div class="formControls col-10 col-sm-10">
                 <table class="table table-border table-bg table-bordered" >
                     <thead>
                     <tr>
@@ -175,6 +175,7 @@
                             <td>${(postageInfo.postageAlipayName)!''}</td>
                             <td>${(postageInfo.postageAlipay)!''}</td>
                             <#if postageInfo.postageStatus??>
+                                <#if postageInfo.postageStatus == 0><td>未申请</td></#if>
                                 <#if postageInfo.postageStatus == 1><td>未申请</td></#if>
                                 <#if postageInfo.postageStatus == 2><td>已申请（待转账）</td></#if>
                                 <#if postageInfo.postageStatus == 3><td>已转账</td></#if>
@@ -187,19 +188,24 @@
                         </tr>
                         </#list>
                     <#else>
-                    <tr><td colspan="7" class="td-manage text-c" >暂时没有邮费信息，请添加！</td></tr>
+                    <tr id="colspanId"><td colspan="7" class="td-manage text-c" >暂时没有邮费信息，请添加！</td></tr>
                     </#if>
                     </tbody>
                 </table>
                     <button type="button" class="btn btn-primary" style="background: #32a3d8;color: #fff;" id="" name="" onclick="showPostageDiv();">录入邮费转账</button>
                 </div>
             </div>
-            <div id="addPostageId" style="display: none;">
+            <div class="row cl" id="addPostageId" style="display: none;">
+            <div class="formControls col-2 col-sm-2 text-r">
+                <strong></strong>
+            </div>
+            <div class="formControls col-10 col-sm-10">
+            <div >
                 <div class="row cl">
                     <div class="formControls col-2 col-sm-2 text-r">
                         <strong>状态</strong>
                     </div>
-                    <div class="formControls col-8 col-sm-8">
+                    <div class="formControls col-10 col-sm-10">
                         <div class="radio-box">
                             <input type="radio" id="tel-66" name="postageStatus" checked value="1">
                             <label for="tel-66">未申请</label>
@@ -251,13 +257,19 @@
                     </div>
                 </div>
             </div>
-
-            <div id="updatePostageId" style="display: none;">
+            </div>
+            </div>
+             <div class="row cl"  id="updatePostageId" style="display: none;">
+                 <div class="formControls col-2 col-sm-2 text-r">
+                        <strong></strong>
+                  </div>
+            <div class="formControls col-10 col-sm-10">
+            <div>
                 <div class="row cl">
                     <div class="formControls col-2 col-sm-2 text-r">
                         <strong>状态</strong>
                     </div>
-                    <div class="formControls col-8 col-sm-8 skin-minimal">
+                    <div class="formControls col-10 col-sm-10 skin-minimal">
                         <div class="radio-box">
                             <input type="radio" id="tel-666" name="postageStatuss" value="1">
                             <label for="tel-666">未申请</label>
@@ -310,6 +322,8 @@
                     </div>
                 </div>
             </div>
+             </div>
+             </div>
             <div class="row cl">
                 <div class="formControls col-2 col-sm-2">
                 </div>
@@ -483,6 +497,8 @@
     function isRelationIsTransfer(type) {
         if(type == 0){
             $("#postageInformation").hide();
+            $("#updatePostageId").hide();
+            $("#addPostageId").hide();
         }else{
             $("#postageInformation").show();
         }
@@ -497,6 +513,26 @@
         var postageAlipayName = $("#postageAlipayName").val();
         var postageAlipay = $("#postageAlipay").val();
         var postageDesc = $("#postageDesc").val();
+        if(postageStatus == null || postageStatus == ""){
+            layer.msg("请选择邮费状态!",{icon: 5,time:1000});
+            return;
+        }
+        if(postageAmount == null || postageAmount == ""){
+            layer.msg("请输入邮费金额!",{icon: 5,time:1000});
+            return;
+        }
+        if (!money.test(postageAmount)) {
+            layer.msg("邮费格式不正确，请重新输入!",{icon: 5,time:1000});
+            return;
+        }
+        if(postageAlipayName == null || postageAlipayName == ""){
+            layer.msg("请输入支付宝姓名!",{icon: 5,time:1000});
+            return;
+        }
+        if(postageAlipay == null || postageAlipay == ""){
+            layer.msg("请输入支付宝账号!",{icon: 5,time:1000});
+            return;
+        }
             $.ajax({
                 cache: true,
                 type: "POST",
@@ -510,7 +546,8 @@
                 async: false,
                 success: function(data){
                     if (data.returnCode == 200) {
-                        postageInfo = postageInfo = data.returnMsg.postageInfo;
+                        $("#colspanId").remove();
+                        postageInfo = data.returnMsg.postageInfo;
                         var postageStatuss
                         if(postageInfo.postageStatus == 1){
                             postageStatuss = "未申请";
@@ -605,7 +642,26 @@
         var postageAlipayName = $("#postageAlipayNames").val();
         var postageAlipay = $("#postageAlipays").val();
         var postageDesc = $("#postageDescs").val();
-
+        if(postageStatus == null || postageStatus == ""){
+            layer.msg("请选择邮费状态!",{icon: 5,time:1000});
+            return;
+        }
+        if(postageAmount == null || postageAmount == ""){
+            layer.msg("请输入邮费金额!",{icon: 5,time:1000});
+            return;
+        }
+        if (!money.test(postageAmount)) {
+            layer.msg("邮费格式不正确，请重新输入!",{icon: 5,time:1000});
+            return;
+        }
+        if(postageAlipayName == null || postageAlipayName == ""){
+            layer.msg("请输入支付宝姓名!",{icon: 5,time:1000});
+            return;
+        }
+        if(postageAlipay == null || postageAlipay == ""){
+            layer.msg("请输入支付宝账号!",{icon: 5,time:1000});
+            return;
+        }
         $.ajax({
             cache: true,
             type: "POST",