邮费转账

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

@@ -15,7 +15,7 @@ public class CustomerCommon implements Serializable {
     private Integer relationId;
     //客诉基本信息主键 
     private Integer customerId;
-    //订单id 
+    //订单id  --  后面有存储Efast订单编号的字段
     private Integer orderId;
     //仓储任务(签收id) 
     private Integer signclosedId;
@@ -64,6 +64,8 @@ public class CustomerCommon implements Serializable {
     private Integer relationState;
     //转账账户 
     private String relationAlipay;
+    //转账账户 (账户姓名)
+    private String relationAlipayName;
     //是否已转账邮费  0:不需要 1:已转  2:已申请待转账   3:未申请
     private Integer relationIsTransfer;
     //创建时间
@@ -86,6 +88,16 @@ public class CustomerCommon implements Serializable {
     private String transactionNumber;
     //  处理结果： 1：已解决  2：未解决 3：换新  4：维修 5：补发 6：退货 7：无理由退货
     private Integer customerIsSolve;
+    //Efast订单编号
+    private String salesOrderId;
+
+    public String getSalesOrderId() {
+        return salesOrderId;
+    }
+
+    public void setSalesOrderId(String salesOrderId) {
+        this.salesOrderId = salesOrderId;
+    }
 
     public Integer getDetectState() {
         return detectState;
@@ -382,4 +394,12 @@ public class CustomerCommon implements Serializable {
     public void setAdminId(Integer adminId) {
         this.adminId = adminId;
     }
+
+    public String getRelationAlipayName() {
+        return relationAlipayName;
+    }
+
+    public void setRelationAlipayName(String relationAlipayName) {
+        this.relationAlipayName = relationAlipayName;
+    }
 }

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

@@ -1,11 +1,14 @@
 package com.iamberry.rst.core.cm;
 
+import java.io.Serializable;
 import java.util.Date;
 
 /**
  * 邮费转账
  */
-public class Postage {
+public class Postage implements Serializable {
+    private static final long serialVersionUID = -4278004816117383308L;
+
     private Integer postageId;
     //客服人员id
     private Integer adminId;
@@ -20,7 +23,7 @@ public class Postage {
     //售后处理方式 3：换新  4：维修  5：补发  6：退货  7：无理由退货
     private Integer postageTreatmentMethod;
     //efast订单号
-    private String salesOrderid;
+    private String salesOrderId;
     //客户姓名
     private String postageClientName;
     //联系电话
@@ -96,12 +99,12 @@ public class Postage {
         this.postageTreatmentMethod = postageTreatmentMethod;
     }
 
-    public String getSalesOrderid() {
-        return salesOrderid;
+    public String getSalesOrderId() {
+        return salesOrderId;
     }
 
-    public void setSalesOrderid(String salesOrderid) {
-        this.salesOrderid = salesOrderid == null ? null : salesOrderid.trim();
+    public void setSalesOrderId(String salesOrderId) {
+        this.salesOrderId = salesOrderId;
     }
 
     public String getPostageClientName() {

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

@@ -33,4 +33,11 @@ public interface CustomerCommonService {
      */
     Integer updateCustomerCommon(CustomerCommon customerCommon);
 
+    /**
+     * 修改处理结果的状态，并添加邮费转账
+     * @param customerCommon
+     * @return
+     */
+    Integer updateCommonAndAddPostage(CustomerCommon customerCommon);
+
 }

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

@@ -7,6 +7,7 @@ import com.iamberry.rst.util.CustomerCommonUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.beans.Transient;
 import java.util.ArrayList;
 import java.util.List;
 
@@ -33,9 +34,12 @@ public class CustomerCommonServiceImpl implements CustomerCommonService {
     private SendProdcueMapper sendProdcueMapper;
     @Autowired
     private SendFittingMapper sendFittingMapper;
-
     @Autowired
     private CustomerCommonMapper customerCommonMapper;
+    @Autowired
+    private CustomerInfoMapper customerInfoMapper;
+    @Autowired
+    private PostageMapper postageMapper;
 
     @Override
     public CustomerCommon getListProduceAndFitting(CustomerCommon customerCommon) {
@@ -101,6 +105,7 @@ public class CustomerCommonServiceImpl implements CustomerCommonService {
     }
 
     @Override
+    @Transient
     public Integer updateCustomerCommon(CustomerCommon customerCommon) {
         Integer flag = 0;
         switch (customerCommon.getCustomerIsSolve()){
@@ -131,5 +136,46 @@ public class CustomerCommonServiceImpl implements CustomerCommonService {
         return flag;
     }
 
+    @Override
+    @Transient
+    public Integer updateCommonAndAddPostage(CustomerCommon customerCommon) {
+        CustomerCommon newCc = new CustomerCommon();
+        newCc.setRelationId(customerCommon.getRelationId());
+        newCc.setRelationBackStatus(4);		//已签收
+        newCc.setCustomerIsSolve(customerCommon.getCustomerIsSolve());
+        Integer flag = customerCommonService.updateCustomerCommon(newCc);
+        if(flag < 1){
+            throw new RuntimeException("修改状态失败");
+        }
+        CustomerInfo customerInfo = customerInfoMapper.getCustomerInfo(customerCommon.getCustomerId());
+        if(customerInfo == null){
+            throw new RuntimeException("查询客诉失败");
+        }
+        //1：已解决  2：未解决 3：换新  4：维修 5：补发 6：退货 7：无理由退货
+        if(customerCommon.getCustomerIsSolve() == 3 || customerCommon.getCustomerIsSolve() == 4
+                || customerCommon.getCustomerIsSolve() == 6|| customerCommon.getCustomerIsSolve() == 7){
+            if(customerCommon.getRelationIsTransfer() != 0){        //需要转邮费
+                Postage postage = new Postage();
+                postage.setAdminId(customerInfo.getAdminId());      //客服
+                postage.setPostageCustomerStatus(1);            //待申请
+                postage.setPostageOrderSource(customerInfo.getStoreId());   //店铺id
+                postage.setPostageTreatmentMethod(customerCommon.getCustomerIsSolve()); //处理方式
+                postage.setSalesOrderId(customerCommon.getSalesOrderId());       //efast订单号
+                postage.setPostageClientName(customerCommon.getRelationBackName());
+                postage.setPostageClientTel(customerCommon.getRelationBackTel());
+                //postage.ser
+                postage.setPostageLogisticsCompany(customerCommon.getRelationBackLogisticsCompany());
+                postage.setPostageLogisticsNo(customerCommon.getRelationBackLogisticsNo());
+                postage.setPostageAmount(customerCommon.getRelationBackPostage());  //寄回邮费
+                postage.setPostageAlipay(customerCommon.getRelationAlipay());   //支付宝账户
+                postage.setPostageAlipayName(customerCommon.getRelationAlipayName());   //支付宝账号名称
+                flag = postageMapper.savePostage(postage);
+                if(flag < 1){
+                    throw new RuntimeException("添加邮费转账失败");
+                }
+            }
+        }
+        return flag;
+    }
 
 }

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

@@ -3,53 +3,167 @@
 <mapper namespace="com.iamberry.rst.service.cm.mapper.CustomerCommonMapper">
 
     <select id="listCustomerCommon" parameterType="CustomerCommon" resultType="CustomerCommon">
-        SELECT cc.*
+        SELECT
+            cc.*,
+            oi.sales_orderId AS salesOrderId
         FROM (
             SELECT
                 '3' AS customerIsSolve,
                 renewed_id AS relationId,
                 customer_id AS customerId,
+                order_id AS  orderId,
+                signclosed_id AS signclosedId,
+                renewed_back_efast_order_id AS  relationBackEfastOrderId,
+                renewed_back_name AS  relationBackName,
+                renewed_back_tel AS  relationBackTel,
                 renewed_back_status  AS relationBackStatus,
                 renewed_back_logistics_company AS relationBackLogisticsCompany,
-                renewed_back_logistics_no AS relationBackLogisticsNo
+                renewed_back_logistics_no AS relationBackLogisticsNo,
+                renewed_back_postage AS relationBackPostage,
+                renewed_back_machine_no AS  relationBackMachineNo,
+                renewed_send_status AS relationSendStatus,
+                renewed_send_name AS  relationSendName,
+                renewed_send_tel AS relationSendTel,
+                province_number AS provinceNumber,
+                city_number AS cityNumber,
+                area_number AS areaNumber,
+                renewed_send_merge_address AS relationSendMergeAddress,
+                renewed_send_address AS relationSendAddress,
+                renewed_send_logistics_company AS relationSendLogisticsCompany,
+                renewed_send_logistics_no AS relationSendLogisticsNo,
+                renewed_desc AS relationDesc,
+                renewed_state AS relationState,
+                renewed_alipay AS relationAlipay,
+                renewed_is_transfer AS relationIsTransfer,
+                renewed_alipay_name AS relationAlipayName
             FROM tb_rst_renewed
             UNION ALL
             SELECT
                 '4' AS customerIsSolve,
                 repair_id AS relationId,
                 customer_id AS customerId,
+                order_id AS  orderId,
+                signclosed_id AS signclosedId,
+                repair_back_efast_order_id AS  relationBackEfastOrderId,
+                repair_back_name AS  relationBackName,
+                repair_back_tel AS  relationBackTel,
                 repair_back_status  AS relationBackStatus,
                 repair_back_logistics_company AS relationBackLogisticsCompany,
-                repair_back_logistics_no AS relationBackLogisticsNo
+                repair_back_logistics_no AS relationBackLogisticsNo,
+                repair_back_postage AS relationBackPostage,
+                repair_back_machine_no AS  relationBackMachineNo,
+                repair_send_status AS relationSendStatus,
+                repair_send_name AS  relationSendName,
+                repair_send_tel AS relationSendTel,
+                province_number AS provinceNumber,
+                city_number AS cityNumber,
+                area_number AS areaNumber,
+                repair_send_merge_address AS relationSendMergeAddress,
+                repair_send_address AS relationSendAddress,
+                repair_send_logistics_company AS relationSendLogisticsCompany,
+                repair_send_logistics_no AS relationSendLogisticsNo,
+                repair_desc AS relationDesc,
+                repair_state AS relationState,
+                repair_alipay AS relationAlipay,
+                repair_is_transfer AS relationIsTransfer,
+                repair_alipay_name AS relationAlipayName
             FROM tb_rst_repair
             UNION ALL
             SELECT
                 '5' AS customerIsSolve,
                 reissue_id AS relationId,
                 customer_id AS customerId,
+                order_id AS  orderId,
+                NULL AS signclosedId,
+                reissue_back_efast_order_id AS  relationBackEfastOrderId,
+                NULL AS  relationBackName,
+                NULL AS  relationBackTel,
                 NULL  AS relationBackStatus,
                 NULL AS relationBackLogisticsCompany,
-                NULL AS relationBackLogisticsNo
+                NULL AS relationBackLogisticsNo,
+                NULL AS relationBackPostage,
+                NULL AS  relationBackMachineNo,
+                reissue_send_status AS relationSendStatus,
+                reissue_send_name AS  relationSendName,
+                reissue_send_tel AS relationSendTel,
+                province_number AS provinceNumber,
+                city_number AS cityNumber,
+                area_number AS areaNumber,
+                reissue_send_merge_address AS relationSendMergeAddress,
+                reissue_send_address AS relationSendAddress,
+                reissue_send_logistics_company AS relationSendLogisticsCompany,
+                reissue_send_logistics_no AS relationSendLogisticsNo,
+                reissue_desc AS relationDesc,
+                reissue_state AS relationState,
+                NULL AS relationAlipay,
+                NULL AS relationIsTransfer,
+                NULL AS relationAlipayName
             FROM tb_rst_reissue
             UNION ALL
             SELECT
                 '6' AS customerIsSolve,
                 back_goods_id AS relationId,
                 customer_id AS customerId,
+                order_id AS  orderId,
+                signclosed_id AS signclosedId,
+                NULL AS  relationBackEfastOrderId,
+                back_goods_back_name AS  relationBackName,
+                back_goods_back_tel AS  relationBackTel,
                 back_goods_back_status  AS relationBackStatus,
                 back_goods_back_logistics_company AS relationBackLogisticsCompany,
-                back_goods_back_logistics_no AS relationBackLogisticsNo
+                back_goods_back_logistics_no AS relationBackLogisticsNo,
+                back_goods_back_postage AS relationBackPostage,
+                back_goods_back_machine_no AS  relationBackMachineNo,
+                NULL AS relationSendStatus,
+                NULL AS  relationSendName,
+                NULL AS relationSendTel,
+                NULL AS provinceNumber,
+                NULL AS cityNumber,
+                NULL AS areaNumber,
+                NULL AS relationSendMergeAddress,
+                NULL AS relationSendAddress,
+                NULL AS relationSendLogisticsCompany,
+                NULL AS relationSendLogisticsNo,
+                back_goods_desc AS relationDesc,
+                back_goods_state AS relationState,
+                back_goods_alipay AS relationAlipay,
+                back_goods_is_transfer AS relationIsTransfer,
+                back_goods_alipay_name AS relationAlipayName
             FROM tb_rst_back_goods
             UNION ALL
             SELECT
                 '7' AS customerIsSolve,
                 noreason_back_id AS relationId,
                 customer_id AS customerId,
+                order_id AS  orderId,
+                signclosed_id AS signclosedId,
+                NULL AS  relationBackEfastOrderId,
+                noreason_back_back_name AS  relationBackName,
+                noreason_back_back_tel AS  relationBackTel,
                 noreason_back_back_status  AS relationBackStatus,
                 noreason_back_back_logistics_company AS relationBackLogisticsCompany,
-                noreason_back_back_logistics_no AS relationBackLogisticsNo
+                noreason_back_back_logistics_no AS relationBackLogisticsNo,
+                noreason_back_back_postage AS relationBackPostage,
+                noreason_back_back_machine_no AS  relationBackMachineNo,
+                NULL AS relationSendStatus,
+                NULL AS  relationSendName,
+                NULL AS relationSendTel,
+                NULL AS provinceNumber,
+                NULL AS cityNumber,
+                NULL AS areaNumber,
+                NULL AS relationSendMergeAddress,
+                NULL AS relationSendAddress,
+                NULL AS relationSendLogisticsCompany,
+                NULL AS relationSendLogisticsNo,
+                noreason_back_desc AS relationDesc,
+                noreason_back_state AS relationState,
+                noreason_back_alipay AS relationAlipay,
+                noreason_back_is_transfer AS relationIsTransfer,
+                noreason_back_alipay_name AS relationAlipayName
             FROM tb_rst_noreason_back
-        )cc LEFT JOIN tb_rst_customer_info c on cc.customerId = c.customer_id
+        )cc
+        LEFT JOIN tb_rst_customer_info c on cc.customerId = c.customer_id
+        LEFT JOIN tb_rst_sales_order_info oi ON cc.orderId = oi.sales_id
         <where>
             <if test="customerId != null and customerId != ''">
                 AND cc.customerId = #{customerId}

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

@@ -36,21 +36,20 @@
   </select>
 
   <insert id="savePostage" parameterType="Postage" >
-    insert into tb_rst_postage (postage_id, admin_id, postage_customer_status,
-    postage_manager_status, postage_finance_status,
-    postage_order_source, "postage_treatment method",
-    sales_orderId, postage_client_name, postage_client_tel,
-    postage_logistics_company, postage_logistics_no,
-    postage_amount, postage_alipay, postage_alipay_name,
-    postage_create_time, postage_update_time
+    insert into tb_rst_postage (
+      postage_id, admin_id, postage_customer_status,
+      postage_manager_status, postage_finance_status,
+      postage_order_source, postage_treatment_method,
+      sales_orderId, postage_client_name, postage_client_tel,
+      postage_logistics_company, postage_logistics_no,
+      postage_amount, postage_alipay, postage_alipay_name
     )
     values (#{postageId,jdbcType=INTEGER}, #{adminId,jdbcType=INTEGER}, #{postageCustomerStatus,jdbcType=INTEGER},
     #{postageManagerStatus,jdbcType=INTEGER}, #{postageFinanceStatus,jdbcType=INTEGER},
     #{postageOrderSource,jdbcType=INTEGER}, #{postageTreatmentMethod,jdbcType=INTEGER},
-    #{salesOrderid,jdbcType=VARCHAR}, #{postageClientName,jdbcType=VARCHAR}, #{postageClientTel,jdbcType=VARCHAR},
+    #{salesOrderId,jdbcType=VARCHAR}, #{postageClientName,jdbcType=VARCHAR}, #{postageClientTel,jdbcType=VARCHAR},
     #{postageLogisticsCompany,jdbcType=VARCHAR}, #{postageLogisticsNo,jdbcType=VARCHAR},
-    #{postageAmount,jdbcType=INTEGER}, #{postageAlipay,jdbcType=VARCHAR}, #{postageAlipayName,jdbcType=VARCHAR},
-    #{postageCreateTime,jdbcType=TIMESTAMP}, #{postageUpdateTime,jdbcType=TIMESTAMP}
+    #{postageAmount,jdbcType=INTEGER}, #{postageAlipay,jdbcType=VARCHAR}, #{postageAlipayName,jdbcType=VARCHAR}
     )
   </insert>
 
@@ -97,13 +96,7 @@
         postage_alipay = #{postageAlipay,jdbcType=VARCHAR},
       </if>
       <if test="postageAlipayName != null" >
-        postage_alipay_name = #{postageAlipayName,jdbcType=VARCHAR},
-      </if>
-      <if test="postageCreateTime != null" >
-        postage_create_time = #{postageCreateTime,jdbcType=TIMESTAMP},
-      </if>
-      <if test="postageUpdateTime != null" >
-        postage_update_time = #{postageUpdateTime,jdbcType=TIMESTAMP},
+        postage_alipay_name = #{postageAlipayName,jdbcType=VARCHAR}
       </if>
     </set>
     where postage_id = #{postageId,jdbcType=INTEGER}

watero-rst-service/src/main/java/com/iamberry/rst/util/CustomerCommonUtil.java

@@ -40,6 +40,7 @@ public class CustomerCommonUtil {
                 renewed.setRenewedDesc(c.getRelationDesc());
                 renewed.setRenewedState(c.getRelationState());
                 renewed.setRenewedAlipay(c.getRelationAlipay());
+                renewed.setRenewedAlipayName(c.getRelationAlipayName());
                 renewed.setRenewedIsTransfer(c.getRelationIsTransfer());
                 renewed.setRenewedCreateTime(c.getRelationCreateTime());
                 renewed.setRenewedUpdateTime(c.getRelationUpdateTime());
@@ -71,6 +72,7 @@ public class CustomerCommonUtil {
                 repair.setRepairDesc(c.getRelationDesc());
                 repair.setRepairState(c.getRelationState());
                 repair.setRepairAlipay(c.getRelationAlipay());
+                repair.setRepairAlipayName(c.getRelationAlipayName());
                 repair.setRepairIsTransfer(c.getRelationIsTransfer());
                 repair.setRepairCreateTime(c.getRelationCreateTime());
                 repair.setRepairUpdateTime(c.getRelationUpdateTime());
@@ -112,6 +114,7 @@ public class CustomerCommonUtil {
                 backGoods.setBackGoodsDesc(c.getRelationDesc());
                 backGoods.setBackGoodsState(c.getRelationState());
                 backGoods.setBackGoodsAlipay(c.getRelationAlipay());
+                backGoods.setBackGoodsAlipayName(c.getRelationAlipayName());
                 backGoods.setBackGoodsIsTransfer(c.getRelationIsTransfer());
                 backGoods.setBackGoodsCreateTime(c.getRelationCreateTime());
                 backGoods.setBackGoodsUpdateTime(c.getRelationUpdateTime());
@@ -132,6 +135,7 @@ public class CustomerCommonUtil {
                 noreasonBack.setNoreasonBackDesc(c.getRelationDesc());
                 noreasonBack.setNoreasonBackState(c.getRelationState());
                 noreasonBack.setNoreasonBackAlipay(c.getRelationAlipay());
+                noreasonBack.setNoreasonBackAlipayName(c.getRelationAlipayName());
                 noreasonBack.setNoreasonBackIsTransfer(c.getRelationIsTransfer());
                 noreasonBack.setNoreasonBackCreateTime(c.getRelationCreateTime());
                 noreasonBack.setNoreasonBackUpdateTime(c.getRelationUpdateTime());
@@ -183,6 +187,7 @@ public class CustomerCommonUtil {
                 customerCommon.setRelationDesc(renewed.getRenewedDesc());
                 customerCommon.setRelationState(renewed.getRenewedState());
                 customerCommon.setRelationAlipay(renewed.getRenewedAlipay());
+                customerCommon.setRelationAlipayName(renewed.getRenewedAlipayName());
                 customerCommon.setRelationIsTransfer(renewed.getRenewedIsTransfer());
                 customerCommon.setRelationCreateTime(renewed.getRenewedCreateTime());
                 customerCommon.setRelationUpdateTime(renewed.getRenewedUpdateTime());
@@ -215,6 +220,7 @@ public class CustomerCommonUtil {
                 customerCommon.setRelationDesc(repair.getRepairDesc());
                 customerCommon.setRelationState(repair.getRepairState());
                 customerCommon.setRelationAlipay(repair.getRepairAlipay());
+                customerCommon.setRelationAlipayName(repair.getRepairAlipayName());
                 customerCommon.setRelationIsTransfer(repair.getRepairIsTransfer());
                 customerCommon.setRelationCreateTime(repair.getRepairCreateTime());
                 customerCommon.setRelationUpdateTime(repair.getRepairUpdateTime());
@@ -258,6 +264,7 @@ public class CustomerCommonUtil {
                 customerCommon.setRelationDesc(backGoods.getBackGoodsDesc());
                 customerCommon.setRelationState(backGoods.getBackGoodsState());
                 customerCommon.setRelationAlipay(backGoods.getBackGoodsAlipay());
+                customerCommon.setRelationAlipayName(backGoods.getBackGoodsAlipayName());
                 customerCommon.setRelationIsTransfer(backGoods.getBackGoodsIsTransfer());
                 customerCommon.setRelationCreateTime(backGoods.getBackGoodsCreateTime());
                 customerCommon.setRelationUpdateTime(backGoods.getBackGoodsUpdateTime());
@@ -279,6 +286,7 @@ public class CustomerCommonUtil {
                 customerCommon.setRelationDesc(noreasonBack.getNoreasonBackDesc());
                 customerCommon.setRelationState(noreasonBack.getNoreasonBackState());
                 customerCommon.setRelationAlipay(noreasonBack.getNoreasonBackAlipay());
+                customerCommon.setRelationAlipayName(noreasonBack.getNoreasonBackAlipayName());
                 customerCommon.setRelationIsTransfer(noreasonBack.getNoreasonBackIsTransfer());
                 customerCommon.setRelationCreateTime(noreasonBack.getNoreasonBackCreateTime());
                 customerCommon.setRelationUpdateTime(noreasonBack.getNoreasonBackUpdateTime());

watero-rst-web/src/main/java/com/iamberry/rst/controllers/mq/MQTask.java

@@ -426,6 +426,7 @@ public class MQTask implements InitializingBean {
 
 	/**客诉系统  自动追踪发货信息**/
 	@Scheduled(cron = "0 0/30 * * * ?")//每30分钟执行一次
+//	@Scheduled(cron = "0 0/1 * * * ?")//每1分钟执行一次
 	public void syncSendBackCustomer()throws Exception{
 		CustomerCommon customerCommon = new CustomerCommon();
 		customerCommon.setRelationBackStatus(2);
@@ -434,12 +435,13 @@ public class MQTask implements InitializingBean {
 			CustomerCommon cc = customerCommonList.get(i);
 			if(!StringUtils.isEmpty(cc.getRelationBackLogisticsCompany()) && !StringUtils.isEmpty(cc.getRelationBackLogisticsNo())){
 				JSONObject rst = kuaidi100.getExpressInfo(cc.getRelationBackLogisticsCompany(),cc.getRelationBackLogisticsNo());
-				if(rst.has("state") && rst.getInt("state") == 3){
-					CustomerCommon newCc = new CustomerCommon();
-					newCc.setRelationId(cc.getRelationId());
-					newCc.setRelationBackStatus(4);		//已签收
-					newCc.setCustomerIsSolve(cc.getCustomerIsSolve());
-					Integer flag = customerCommonService.updateCustomerCommon(newCc);
+				if(rst.has("state") && rst.getInt("state") == 3){	//当快递状态为已签收的时候
+					Integer flag = 0;
+					try{
+						flag = customerCommonService.updateCommonAndAddPostage(cc);
+					}catch (RuntimeException e){
+						logger.info("====== 客诉寄回签收报错 ：客诉id："+cc.getCustomerId()+" ======"+e.getMessage());
+					}
 					if(flag < 1){
 						logger.info("====== 客诉寄回签收失败 ：客诉id："+cc.getCustomerId()+" ======");
 					}else{

watero-rst-web/src/main/webapp/WEB-INF/views/order/excel_to_order.ftl

@@ -114,6 +114,7 @@
                             <option value="33">尹建莉</option>
 							<option value="34">老虎工作室</option>
 							<option value="35">有赞</option>
+							<option value="37">深圳鑫之鹏</option>
                         </select>
                     </label>
                 </td>