Merge branch 'master' of http://git.iamberry.com/hexiugang/iamberry-common-parent

watero-rst-interface/src/main/java/com/iamberry/rst/faces/pts/ProduceService.java

@@ -75,4 +75,10 @@ public interface ProduceService {
      * @return
      */
     WechatMp getWechatMpById(Integer wechatMpId);
+
+    /**
+     * 获取公众号信息
+     * @return
+     */
+    List<WechatMp> listWechatMp();
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/ProduceServiceImpl.java

@@ -286,4 +286,9 @@ public class ProduceServiceImpl implements ProduceService {
     public WechatMp getWechatMpById(Integer wechatMpId) {
         return produceMapper.getWechatMpById(wechatMpId);
     }
+
+    @Override
+    public List<WechatMp> listWechatMp() {
+        return produceMapper.listWechatMp();
+    }
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/ProduceMapper.java

@@ -94,4 +94,12 @@ public interface ProduceMapper {
      * @return
      */
     WechatMp getWechatMpById(Integer wechatMpId);
+
+    /**
+     * 获取公众号信息
+     * @return
+     */
+    List<WechatMp> listWechatMp();
+
+
 }

watero-rst-service/src/main/java/com/iamberry/rst/service/pts/mapper/produceMapper.xml

@@ -197,8 +197,8 @@
 
 
     <insert id="saveProduce" parameterType="Produce" useGeneratedKeys="true"  keyProperty="produceId">
-        insert into tb_rst_pts_produce (produce_id,produce_no,produce_name,produce_status,produce_remake,produce_type,produce_pattern,produce_model,produce_feature)
-        values (#{produceId},#{produceNo},#{produceName},#{produceStatus},#{produceRemake},#{produceType},#{producePattern},#{produceModel},#{produceFeature})
+        insert into tb_rst_pts_produce (produce_id,produce_no,produce_name,produce_status,produce_remake,produce_type,produce_pattern,produce_model,produce_feature,wechat_mp_id)
+        values (#{produceId},#{produceNo},#{produceName},#{produceStatus},#{produceRemake},#{produceType},#{producePattern},#{produceModel},#{produceFeature},#{wechatMpId})
     </insert>
 
     <update id="updateProduce" parameterType="Produce" >
@@ -226,7 +226,10 @@
                 produce_feature = #{produceFeature},
             </if>
             <if test="produceRemake !=null and produceRemake !=''">
-                produce_remake = #{produceRemake}
+                produce_remake = #{produceRemake},
+            </if>
+            <if test="wechatMpId !=null and wechatMpId !=''">
+                wechat_mp_id = #{wechatMpId}
             </if>
         </set>
         WHERE
@@ -492,4 +495,14 @@
         wechat_mp_pubno AS wechatMpPubno
          from tb_rst_pts_wechat_mp where wechat_mp_id = #{0}
     </select>
+
+    <select id="listWechatMp" resultType="WechatMp">
+        SELECT
+        wechat_mp_id AS wechatMpId,
+        wechat_mp_appid AS wechatMpAppid,
+        wechat_mp_appsecret AS wechatMpAppsecret,
+        wechat_mp_name AS wechatMpName,
+        wechat_mp_pubno AS wechatMpPubno
+        from tb_rst_pts_wechat_mp
+    </select>
 </mapper>

watero-rst-web/src/main/java/com/iamberry/rst/controllers/order/AdminOrderController.java

@@ -38,7 +38,9 @@ import org.springframework.web.bind.annotation.ResponseBody;
 import org.springframework.web.servlet.ModelAndView;
 
 import javax.servlet.http.HttpServletRequest;
+import java.io.File;
 import java.io.IOException;
+import java.text.SimpleDateFormat;
 import java.util.*;
 
 /**
@@ -615,6 +617,12 @@ public class AdminOrderController {
         // 读取文件中内容
         List<EfastOrder> orderEfasts = ExcelUtil.readCell(request.getServletContext().getRealPath(filePath),
                     productName, maps, infos, tel, name, num, priceMap, postType,shopId);
+
+//        StringBuffer sb = new StringBuffer();
+//        for(int i =0 ;i<orderEfasts.size();i++) {
+//            sb.append(orderEfasts.get(i).getOrderId());
+//        }
+//        createFile(sb.toString());
         // 推送
         try {
             efastOrderService.sendOrderInfoToEfast(orderEfasts, null);
@@ -626,6 +634,35 @@ public class AdminOrderController {
                 .addResponseKeyValue("order_list", orderEfasts);
     }
 
+//    /**
+//     * 创建文件
+//     * @param fileName  文件名称
+//     * @param filecontent   文件内容
+//     * @return  是否创建成功，成功则返回true
+//     */
+//    public static boolean createFile(String filecontent){
+//        Boolean bool = false;
+//        SimpleDateFormat formatter = new SimpleDateFormat("yyyy-MM-dd");
+//        String dateString = formatter.format(new Date());
+//        String path = "\\common\\file\\upload\\file\\" + dateString;
+//
+//        String dateString = formatter.format(new Date());
+//        String fileName = "";
+//
+//        String filenameTemp = path + fileName+".txt";//文件路径+名称+文件类型
+//        File file = new File(filenameTemp);
+//        try {
+//            //如果文件不存在，则创建新的文件
+//            if(!file.exists()){
+//                file.createNewFile();
+//            }
+//        } catch (Exception e) {
+//            e.printStackTrace();
+//        }
+//
+//        return bool;
+//    }
+
     /**
      * 进入支付剩余订单金额页面
      * @param request

watero-rst-web/src/main/java/com/iamberry/rst/controllers/pts/AdminProduceController.java

@@ -3,6 +3,7 @@ package com.iamberry.rst.controllers.pts;
 import com.iamberry.rst.core.pts.ProcessNode;
 import com.iamberry.rst.core.pts.Produce;
 import com.iamberry.rst.core.pts.ProduceProcess;
+import com.iamberry.rst.core.pts.WechatMp;
 import com.iamberry.rst.faces.pts.ProduceService;
 import com.iamberry.wechat.tools.ResponseJson;
 import net.sf.json.JSONArray;
@@ -62,6 +63,8 @@ public class AdminProduceController {
     @RequestMapping("/to_save_produce")
     public ModelAndView goSaveProduce(HttpServletRequest request) {
         ModelAndView mv = new ModelAndView("pts/produce/save_produce");
+        List<WechatMp> listWechatMp = produceService.listWechatMp();
+        mv.addObject("listWechatMp",listWechatMp);
         return mv;
     }
 
@@ -118,6 +121,10 @@ public class AdminProduceController {
             producePro.setNodes(processNodeList);
         }
         produce.setProcess(produceProcessList);
+
+        List<WechatMp> listWechatMp = produceService.listWechatMp();
+        mv.addObject("listWechatMp",listWechatMp);
+
         mv.addObject("produce", produce);
         return mv;
     }

watero-rst-web/src/main/java/com/iamberry/rst/utils/test.java

@@ -1,17 +1,22 @@
 package com.iamberry.rst.utils;
+import com.alibaba.dubbo.common.json.JSON;
 
 import com.auth0.jwt.internal.org.apache.commons.codec.binary.Base64;
 import com.auth0.jwt.internal.org.apache.commons.codec.binary.StringUtils;
 import net.sf.json.JSONArray;
 import net.sf.json.JSONObject;
-import org.apache.kafka.clients.consumer.ConsumerRecord;
+//import org.apache.kafka.clients.consumer.ConsumerRecord;
 //import org.apache.kafka.clients.consumer.ConsumerRecord;
 
 
+import java.io.File;
+import java.io.FileInputStream;
 import java.security.Key;
+import java.util.Map;
 
 import javax.crypto.Cipher;
 import javax.crypto.spec.SecretKeySpec;
+import java.security.Key;
 
 
 public class test {

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

@@ -41,20 +41,20 @@
             </div>
             <div class="formControls col-10 col-sm-10 skin-minimal">
                 <div class="radio-box">
-                    <input type="radio" name="backGoodsBackStatus" value="1">
+                    <input type="radio" id="tel-3" name="backGoodsBackStatus" value="1">
                     <label for="tel-3">未寄回</label>
                 </div>
                 <div class="radio-box">
-                    <input type="radio" name="backGoodsBackStatus" value="2">
+                    <input type="radio" id="tel-4" name="backGoodsBackStatus" value="2">
                     <label for="tel-4">已寄回</label>
                 </div>
                 <div class="radio-box">
-                    <input type="radio" name="backGoodsBackStatus" value="3">
-                    <label for="tel-4">已收货</label>
+                    <input type="radio" id="tel-5" name="backGoodsBackStatus" value="3">
+                    <label for="tel-5">已收货</label>
                 </div>
             </div>
         </div>
-        <div class="row cl">
+        <div class="row cl" id="backLogisticsInfo" style="display: none">
             <div class="formControls col-2 col-sm-2 text-r">
                 <strong>寄回信息</strong>
             </div>
@@ -86,26 +86,26 @@
                 <input style="width: 150px;" type="text" class="input-text" value="" placeholder="用户支付宝账户" id="backGoodsAlipay" name="backGoodsAlipay">
             </div>
         </div>
-        <div class="row cl">
+        <div class="row cl" id="backTransferInfo" style="display: none">
             <div class="formControls col-2 col-sm-2 text-r">
                 <strong>邮费处理</strong>
             </div>
             <div class="formControls col-10 col-sm-10 skin-minimal">
                 <div class="radio-box">
-                    <input type="radio" name="backGoodsIsTransfer" value="0">
+                    <input type="radio" id="tel-6" name="backGoodsIsTransfer" value="0">
                     <label for="tel-6">不需要转账</label>
                 </div>
                 <div class="radio-box">
-                    <input type="radio" name="backGoodsIsTransfer" value="1">
+                    <input type="radio" id="tel-7" name="backGoodsIsTransfer" value="1">
                     <label for="tel-7">已转账</label>
                 </div>
                 <div class="radio-box">
-                    <input type="radio" name="backGoodsIsTransfer" value="2">
+                    <input type="radio" id="tel-8" name="backGoodsIsTransfer" value="2">
                     <label for="tel-8">待转账</label>
                 </div>
             </div>
         </div>
-        <div class="row cl">
+        <div class="row cl" style="display: none;" id="backUserInfo">
             <div class="formControls col-2 col-sm-2 text-r">
                 <strong>寄件信息</strong>
             </div>
@@ -184,8 +184,26 @@
         });
         get_book_goods_info();
         showUpdateSendProduct();
+
+        /* 监听寄回状态按钮 */
+        $("input[name='backGoodsBackStatus']").change(function (){
+            initBackInfo($(this).val());
+        })
     });
 
+    /*初始化寄回信息*/
+    function initBackInfo(statusCode){
+        if(statusCode == 1){
+            $("#backLogisticsInfo").hide();
+            $("#backTransferInfo").hide();
+            $("#backUserInfo").hide();
+        }else{
+            $("#backLogisticsInfo").show();
+            $("#backTransferInfo").show();
+            $("#backUserInfo").show();
+        }
+    }
+
     /*显示所有产品及配件信息*/
     function showUpdateSendProduct() {
         var productList = getProduct() ; //所有产品
@@ -363,6 +381,10 @@
                             $(this).iCheck('check');
                         }
                     });
+
+                    /*初始化寄回信息*/
+                    initBackInfo(backGoods.backGoodsBackStatus);
+
                     var backProduct = '';
                     if (backGoods.closedProdcues != null && backGoods.closedProdcues.length > 0) {
                         $.each(backGoods.closedProdcues,function(index,element){
@@ -422,31 +444,32 @@
         var backGoodsBackTel = $('#backGoodsBackTel').val();
         /*var backGoodsBackMachineNo = $('#backGoodsBackMachineNo').val();*/
         if (backGoodsBackStatus == 1) {
-            if (backGoodsBackLogisticsNo != null && backGoodsBackLogisticsNo != '') {
-                alert("产品未寄回，不能有物流信息!");
-                backGoods_flag = false;
-                return backGoods_flag;
-            }
-            if (backGoodsBackPostage != null && backGoodsBackPostage != '') {
-                alert("产品未寄回，不能有邮费!");
-                backGoods_flag = false;
-                return backGoods_flag;
-            }
-            if (backGoodsBackLogisticsCompany != null && backGoodsBackLogisticsCompany != '') {
-                alert("产品未寄回，不能选择物流公司!");
-                backGoods_flag = false;
-                return backGoods_flag;
-            }
-            if (backGoodsBackName != null && backGoodsBackName != '') {
-                alert("产品未寄回，不能填写寄回人信息!");
-                backGoods_flag = false;
-                return backGoods_flag;
-            }
-            if (backGoodsBackTel != null && backGoodsBackTel != '') {
-                alert("产品未寄回，不能填写寄回人电话号码!");
-                backGoods_flag = false;
-                return backGoods_flag;
-            }
+//            if (backGoodsBackLogisticsNo != null && backGoodsBackLogisticsNo != '') {
+//                alert("产品未寄回，不能有物流信息!");
+//                vailErrorMsg($("#datemin"),"产品未寄回，不能有物流信息!");
+//                backGoods_flag = false;
+//                return backGoods_flag;
+//            }
+//            if (backGoodsBackPostage != null && backGoodsBackPostage != '') {
+//                alert("产品未寄回，不能有邮费!");
+//                backGoods_flag = false;
+//                return backGoods_flag;
+//            }
+//            if (backGoodsBackLogisticsCompany != null && backGoodsBackLogisticsCompany != '') {
+//                alert("产品未寄回，不能选择物流公司!");
+//                backGoods_flag = false;
+//                return backGoods_flag;
+//            }
+//            if (backGoodsBackName != null && backGoodsBackName != '') {
+//                alert("产品未寄回，不能填写寄回人信息!");
+//                backGoods_flag = false;
+//                return backGoods_flag;
+//            }
+//            if (backGoodsBackTel != null && backGoodsBackTel != '') {
+//                alert("产品未寄回，不能填写寄回人电话号码!");
+//                backGoods_flag = false;
+//                return backGoods_flag;
+//            }
             /*if (backGoodsBackMachineNo != null && backGoodsBackMachineNo != '') {
                 alert("产品未寄回，不能填写机器编号!");
                 backGoods_flag = false;
@@ -454,7 +477,7 @@
             }*/
         } else if (backGoodsBackStatus == 2 || backGoodsBackStatus == 3) {
             if (backGoodsBackLogisticsNo == null || backGoodsBackLogisticsNo == '') {
-                alert("物流信息不能为空!");
+                vailErrorMsg($('#backGoodsBackLogisticsNo'),"物流信息不能为空!");
                 backGoods_flag = false;
                 return backGoods_flag;
             }
@@ -464,7 +487,7 @@
                 return backGoods_flag;
             }
             if (backGoodsBackLogisticsCompany == null || backGoodsBackLogisticsCompany == '') {
-                alert("请选择物流公司!");
+                vailErrorMsg($('#backGoodsBackLogisticsCompany'),"请选择物流公司!");
                 backGoods_flag = false;
                 return backGoods_flag;
             }

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

@@ -40,20 +40,20 @@
             </div>
             <div class="formControls col-10 col-sm-10 skin-minimal">
                 <div class="radio-box">
-                    <input type="radio" name="noreasonBackBackStatus" value="1">
+                    <input type="radio" id="tel-3" name="noreasonBackBackStatus" value="1">
                     <label for="tel-3">未寄回</label>
                 </div>
                 <div class="radio-box">
-                    <input type="radio" name="noreasonBackBackStatus" value="2">
+                    <input type="radio" id="tel-4" name="noreasonBackBackStatus" value="2">
                     <label for="tel-4">已寄回</label>
                 </div>
                 <div class="radio-box">
-                    <input type="radio" name="noreasonBackBackStatus" value="3">
-                    <label for="tel-4">已收货</label>
+                    <input type="radio" id="tel-5" name="noreasonBackBackStatus" value="3">
+                    <label for="tel-5">已收货</label>
                 </div>
             </div>
         </div>
-        <div class="row cl">
+        <div class="row cl"  id="backLogisticsInfo" style="display: none">
             <div class="formControls col-2 col-sm-2 text-r">
                 <strong>寄回信息</strong>
             </div>
@@ -85,26 +85,26 @@
                 <input style="width: 150px;" type="text" class="input-text" value="" placeholder="用户支付宝账户" id="noreasonBackAlipay" name="noreasonBackAlipay">
             </div>
         </div>
-        <div class="row cl">
+        <div class="row cl" id="backTransferInfo" style="display: none">
             <div class="formControls col-2 col-sm-2 text-r">
                 <strong>邮费处理</strong>
             </div>
             <div class="formControls col-10 col-sm-10 skin-minimal">
                 <div class="radio-box">
-                    <input type="radio" name="noreasonBackIsTransfer" value="0">
+                    <input type="radio" id="tel-6" name="noreasonBackIsTransfer" value="0">
                     <label for="tel-6">不需要转账</label>
                 </div>
                 <div class="radio-box">
-                    <input type="radio" name="noreasonBackIsTransfer" value="1">
+                    <input type="radio" id="tel-7" name="noreasonBackIsTransfer" value="1">
                     <label for="tel-7">已转账</label>
                 </div>
                 <div class="radio-box">
-                    <input type="radio" name="noreasonBackIsTransfer" value="2">
+                    <input type="radio" id="tel-8" name="noreasonBackIsTransfer" value="2">
                     <label for="tel-8">代转账</label>
                 </div>
             </div>
         </div>
-        <div class="row cl">
+        <div class="row cl" style="display: none;" id="backUserInfo">
             <div class="formControls col-2 col-sm-2 text-r">
                 <strong>寄件信息</strong>
             </div>
@@ -182,8 +182,26 @@
         });
         get_noreason_info();
         showUpdateSendProduct();
+
+        /* 监听寄回状态按钮 */
+        $("input[name='noreasonBackBackStatus']").change(function (){
+            initBackInfo( $(this).val());
+        })
     });
 
+    /*初始化寄回信息*/
+    function initBackInfo(statusCode){
+        if(statusCode == 1){
+            $("#backLogisticsInfo").hide();
+            $("#backTransferInfo").hide();
+            $("#backUserInfo").hide();
+        }else{
+            $("#backLogisticsInfo").show();
+            $("#backTransferInfo").show();
+            $("#backUserInfo").show();
+        }
+    }
+
     /*显示所有产品及配件信息*/
     function showUpdateSendProduct() {
         var productList = getProduct() ; //所有产品
@@ -361,6 +379,10 @@
                             $(this).iCheck('check');
                         }
                     });
+
+                    /*初始化寄回信息*/
+                    initBackInfo(noreasonBack.noreasonBackBackStatus);
+
                     var noreasonProduct = '';
                     if (noreasonBack.closedProdcues != null && noreasonBack.closedProdcues.length > 0) {
                         $.each(noreasonBack.closedProdcues,function(index,element){
@@ -420,31 +442,31 @@
         var noreasonBackBackTel = $('#noreasonBackBackTel').val();
         /*var noreasonBackBackMachineNo = $('#noreasonBackBackMachineNo').val();*/
         if (noreasonBackBackStatus == 1) {
-            if (noreasonBackBackLogisticsNo != null && noreasonBackBackLogisticsNo != '') {
-                alert("产品未寄回，不能有物流信息!");
-                noreasonBack_flag = false;
-                return noreasonBack_flag;
-            }
-            if (noreasonBackBackPostage != null && noreasonBackBackPostage != '') {
-                alert("产品未寄回，不能有邮费!");
-                noreasonBack_flag = false;
-                return noreasonBack_flag;
-            }
-            if (noreasonBackBackLogisticsCompany != null && noreasonBackBackLogisticsCompany != '') {
-                alert("产品未寄回，不能选择物流公司!");
-                noreasonBack_flag = false;
-                return noreasonBack_flag;
-            }
-            if (noreasonBackBackName != null && noreasonBackBackName != '') {
-                alert("产品未寄回，不能填写寄回人信息!");
-                noreasonBack_flag = false;
-                return noreasonBack_flag;
-            }
-            if (noreasonBackBackTel != null && noreasonBackBackTel != '') {
-                alert("产品未寄回，不能填写寄回人电话号码!");
-                noreasonBack_flag = false;
-                return noreasonBack_flag;
-            }
+//            if (noreasonBackBackLogisticsNo != null && noreasonBackBackLogisticsNo != '') {
+//                alert("产品未寄回，不能有物流信息!");
+//                noreasonBack_flag = false;
+//                return noreasonBack_flag;
+//            }
+//            if (noreasonBackBackPostage != null && noreasonBackBackPostage != '') {
+//                alert("产品未寄回，不能有邮费!");
+//                noreasonBack_flag = false;
+//                return noreasonBack_flag;
+//            }
+//            if (noreasonBackBackLogisticsCompany != null && noreasonBackBackLogisticsCompany != '') {
+//                alert("产品未寄回，不能选择物流公司!");
+//                noreasonBack_flag = false;
+//                return noreasonBack_flag;
+//            }
+//            if (noreasonBackBackName != null && noreasonBackBackName != '') {
+//                alert("产品未寄回，不能填写寄回人信息!");
+//                noreasonBack_flag = false;
+//                return noreasonBack_flag;
+//            }
+//            if (noreasonBackBackTel != null && noreasonBackBackTel != '') {
+//                alert("产品未寄回，不能填写寄回人电话号码!");
+//                noreasonBack_flag = false;
+//                return noreasonBack_flag;
+//            }
             /*if (noreasonBackBackMachineNo != null && noreasonBackBackMachineNo != '') {
                 alert("产品未寄回，不能填写机器编号!");
                 noreasonBack_flag = false;

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

@@ -39,60 +39,22 @@
             </div>
             <div class="formControls col-10 col-sm-10 skin-minimal">
                 <div class="radio-box">
-                    <input type="radio" id="reissueSendStatus" name="reissueSendStatus" value="1">
+                    <input type="radio" id="tel-3" name="reissueSendStatus" value="1">
                     <label for="tel-3">未寄送</label>
                 </div>
                 <div class="radio-box">
-                    <input type="radio" id="reissueSendStatus" name="reissueSendStatus" value="2">
+                    <input type="radio" id="tel-4" name="reissueSendStatus" value="2">
                     <label for="tel-4">已寄送</label>
                 </div>
                 <div class="radio-box">
-                    <input type="radio" id="reissueSendStatus" name="reissueSendStatus" value="3">
-                    <label for="tel-4">已收货</label>
+                    <input type="radio" id="tel-5" name="reissueSendStatus" value="3">
+                    <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">
             </div>
         </div>
-        <div class="row cl">
-            <div class="formControls col-2 col-sm-2 text-r">
-                <strong>寄回信息</strong>
-            </div>
-            <div class="formControls col-10 col-sm-10">
-                <div style="width: 300px;display: inline-block;margin-right: 10px;">
-			<span class="select-box">
-				<select name="reissueSendLogisticsCompany" id="reissueSendLogisticsCompany" class="select">
-					<option value="">物流公司</option>
-                    <option value="sto">申通快递</option>
-                    <option value="yto">圆通快递</option>
-                    <option value="sf">顺丰快递</option>
-                    <option value="ems">邮政EMS</option>
-                    <option value="zto">中通快递</option>
-                    <option value="zjs">宅急送</option>
-                    <option value="yunda">韵达快递</option>
-                    <option value="cces">cces快递</option>
-                    <option value="pick">上门提货</option>
-                    <option value="htky">汇通快递</option>
-                    <option value="ttkdex">天天快递</option>
-                    <option value="stars">星晨急便</option>
-                    <option value="jd">京东快递</option>
-                    <option value="01">其他</option>
-                    <option value="02">上门送货</option>
-				</select>
-			</span>
-                </div>
-                <input style="width: 300px;" type="text" class="input-text" value="" placeholder="请输入快递单号" id="reissueSendLogisticsNo" name="reissueSendLogisticsNo">
-            </div>
-        </div>
-        <div class="row cl">
-            <div class="formControls col-2 col-sm-2 text-r">
-                <strong>补寄产品</strong>
-            </div>
-            <div class="formControls col-10 col-sm-10">
-                <div id="sendProduct" class="update-parts"></div>
-            </div>
-        </div>
 
-        <div class="row cl">
+        <div class="row cl" id="sendUserInfo" style="display: none;">
             <div class="formControls col-2 col-sm-2 text-r">
                 <strong>用户信息</strong>
             </div>
@@ -103,7 +65,8 @@
                 <input type="text" class="input-text" value="" placeholder="填写收件人手机号" id="reissueSendTel" name="reissueSendTel">
             </div>
         </div>
-        <div class="row cl">
+
+        <div class="row cl" id="sendAddressInfo" style="display: none">
             <label class="form-label col-2 col-sm-2 text-r"></label>
             <div class="formControls col-10 col-sm-10">
                 <div style="width: 188px;display: inline-block;margin-right: 20px;">
@@ -124,13 +87,46 @@
                 </div>
             </div>
         </div>
-        <div class="row cl">
+
+        <div class="row cl" id="sendaddressDescInfo" style="display: none">
             <label class="form-label col-2 col-sm-2 text-r"></label>
             <div class="formControls col-10 col-sm-10">
                 <input type="text" class="input-text" value="" placeholder="请填写详细地址" id="reissueSendAddress" name="reissueSendAddress">
             </div>
         </div>
-        <div class="row cl">
+
+        <div class="row cl" id="sendLogisticsInfo" 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 style="width: 300px;display: inline-block;margin-right: 10px;">
+			<span class="select-box">
+				<select name="reissueSendLogisticsCompany" id="reissueSendLogisticsCompany" class="select">
+					<option value="">物流公司</option>
+                    <option value="sto">申通快递</option>
+                    <option value="yto">圆通快递</option>
+                    <option value="sf">顺丰快递</option>
+                    <option value="ems">邮政EMS</option>
+                    <option value="zto">中通快递</option>
+                    <option value="zjs">宅急送</option>
+                    <option value="yunda">韵达快递</option>
+                    <option value="cces">cces快递</option>
+                    <option value="pick">上门提货</option>
+                    <option value="htky">汇通快递</option>
+                    <option value="ttkdex">天天快递</option>
+                    <option value="stars">星晨急便</option>
+                    <option value="jd">京东快递</option>
+                    <option value="01">其他</option>
+                    <option value="02">上门送货</option>
+				</select>
+			</span>
+                </div>
+                <input style="width: 300px;" type="text" class="input-text" value="" placeholder="请输入快递单号" id="reissueSendLogisticsNo" name="reissueSendLogisticsNo">
+            </div>
+        </div>
+
+        <div class="row cl" id="sendDescInfo" style="display: none">
             <div class="formControls col-2 col-sm-2 text-r">
                 <strong>备注信息</strong>
             </div>
@@ -138,6 +134,16 @@
                 <textarea name="reissueDesc" id="reissueDesc" cols="" rows="2" class="textarea" placeholder="说点什么..."></textarea>
             </div>
         </div>
+
+        <div class="row cl">
+            <div class="formControls col-2 col-sm-2 text-r">
+                <strong>补寄产品</strong>
+            </div>
+            <div class="formControls col-10 col-sm-10">
+                <div id="sendProduct" class="update-parts"></div>
+            </div>
+        </div>
+
         <div class="row cl">
             <div class="formControls col-2 col-sm-2 text-r">
             </div>
@@ -174,8 +180,30 @@
             increaseArea: '20%'
         });
         get_reissue_info();
+
+        /* 监听寄出状态按钮 */
+        $("input[name='reissueSendStatus']").change(function (){
+            initSendInfo($(this).val());
+        })
     });
 
+    /*初始化寄出信息*/
+    function initSendInfo(statusCode){
+        if(statusCode == 1){
+            $("#sendUserInfo").hide();
+            $("#sendAddressInfo").hide();
+            $("#sendaddressDescInfo").hide();
+            $("#sendLogisticsInfo").hide();
+            $("#sendDescInfo").hide();
+        }else{
+            $("#sendUserInfo").show();
+            $("#sendAddressInfo").show();
+            $("#sendaddressDescInfo").show();
+            $("#sendLogisticsInfo").show();
+            $("#sendDescInfo").show();
+        }
+    }
+
     /*获取售后补发信息*/
     function get_reissue_info() {
         $.ajax({
@@ -208,6 +236,9 @@
                         }
                     });
 
+                    /*初始化寄出信息*/
+                    initSendInfo(reissue.reissueSendStatus);
+
                     var sendProduct = '';
                     if (reissue.sendProdcues != null && reissue.sendProdcues.length > 0) {
                         $.each(reissue.sendProdcues,function(index,element){
@@ -335,16 +366,16 @@
         var reissueSendLogisticsCompany = $('#reissueSendLogisticsCompany').val();//寄出物流公司
         var reissueSendLogisticsNo = $('#reissueSendLogisticsNo').val();//寄出物流单号
         if (reissueSendLogisticsCompany == 1) {
-            if (reissueSendLogisticsCompany != null && reissueSendLogisticsCompany != '') {
-                layer.msg("产品未寄送，不能选择物流公司!",{icon: 5,time:1000});
-                reissue_flag = false;
-                return reissue_flag;
-            }
-            if (reissueSendLogisticsNo != null && reissueSendLogisticsNo != '') {
-                layer.msg("产品未寄送，不能填写物流单号!",{icon: 5,time:1000});
-                reissue_flag = false;
-                return reissue_flag;
-            }
+//            if (reissueSendLogisticsCompany != null && reissueSendLogisticsCompany != '') {
+//                layer.msg("产品未寄送，不能选择物流公司!",{icon: 5,time:1000});
+//                reissue_flag = false;
+//                return reissue_flag;
+//            }
+//            if (reissueSendLogisticsNo != null && reissueSendLogisticsNo != '') {
+//                layer.msg("产品未寄送，不能填写物流单号!",{icon: 5,time:1000});
+//                reissue_flag = false;
+//                return reissue_flag;
+//            }
         } else if (reissueSendLogisticsCompany == 2 || reissueSendLogisticsCompany == 3) {
             if (reissueSendLogisticsCompany == null || reissueSendLogisticsCompany == '') {
                 layer.msg("请选择寄回物流公司!",{icon: 5,time:1000});

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

@@ -321,22 +321,18 @@
 
         /* 监听寄回状态按钮 */
         $("input[name='renewedBackStatus']").change(function (){
-            var renewedBackStatusCode = $(this).val();
-            /*初始化寄回信息*/
-            initRenewedBackInfo(renewedBackStatusCode);
+            initBackInfo($(this).val());
         })
 
         /* 监听寄出状态按钮 */
         $("input[name='renewedSendStatus']").change(function (){
-            var renewedSendStatusCode = $(this).val();
-            /*初始化寄出信息*/
-            initRenewedSendInfo(renewedSendStatusCode);
+            initSendInfo($(this).val());
         })
     });
 
     /*初始化寄回信息*/
-    function initRenewedBackInfo(renewedBackStatusCode){
-        if(renewedBackStatusCode == 1){
+    function initBackInfo(statusCode){
+        if(statusCode == 1){
             $("#backLogisticsInfo").hide();
             $("#backTransferInfo").hide();
             $("#backUserInfo").hide();
@@ -348,8 +344,8 @@
     }
 
     /*初始化寄出信息*/
-    function initRenewedSendInfo(renewedSendStatusCode){
-        if(renewedSendStatusCode == 1){
+    function initSendInfo(statusCode){
+        if(statusCode == 1){
             $("#sendUserInfo").hide();
             $("#sendAddressInfo").hide();
             $("#sendaddressDescInfo").hide();
@@ -364,6 +360,7 @@
         }
     }
 
+
     /*显示所有产品及配件信息*/
     function showUpdateSendProduct() {
         var productList = getProduct() ; //所有产品
@@ -569,9 +566,9 @@
                     });
 
                     /*初始化寄回信息*/
-                    initRenewedBackInfo(renewed.renewedBackStatus);
+                    initBackInfo(renewed.renewedBackStatus);
                     /*初始化寄出信息*/
-                    initRenewedSendInfo(renewed.renewedSendStatus);
+                    initSendInfo(renewed.renewedSendStatus);
 
                     $('#renewedSchedule').html(renewedSchedule);
                     $("#renewedBackLogisticsCompany option[value='" + renewed.renewedBackLogisticsCompany + "']").attr("selected","true");

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

@@ -320,22 +320,18 @@
 
         /* 监听寄回状态按钮 */
         $("input[name='repairBackStatus']").change(function (){
-            var repairBackStatusCode = $(this).val();
-            /*初始化寄回信息*/
-            initRepairBackInfo(repairBackStatusCode);
+            initBackInfo($(this).val());
         })
 
         /* 监听寄出状态按钮 */
-        $("input[name='renewedSendStatus']").change(function (){
-            var renewedSendStatusCode = $(this).val();
-            /*初始化寄出信息*/
-            initRenewedSendInfo(renewedSendStatusCode);
+        $("input[name='repairSendStatus']").change(function (){
+            initSendInfo($(this).val());
         })
     });
 
     /*初始化寄回信息*/
-    function initRepairBackInfo(repairBackStatusCode){
-        if(repairBackStatusCode == 1){
+    function initBackInfo(statusCode){
+        if(statusCode == 1){
             $("#backLogisticsInfo").hide();
             $("#backTransferInfo").hide();
             $("#backUserInfo").hide();
@@ -347,8 +343,8 @@
     }
 
     /*初始化寄出信息*/
-    function initRenewedSendInfo(renewedSendStatusCode){
-        if(renewedSendStatusCode == 1){
+    function initSendInfo(statusCode){
+        if(statusCode == 1){
             $("#sendUserInfo").hide();
             $("#sendAddressInfo").hide();
             $("#sendaddressDescInfo").hide();
@@ -566,6 +562,11 @@
                             $(this).iCheck('check');
                         }
                     });
+                    /*初始化寄回信息*/
+                    initBackInfo(repair.repairBackStatus);
+                    /*初始化寄出信息*/
+                    initSendInfo(repair.repairSendStatus);
+
                     $("#repairBackLogisticsCompany option[value='" + repair.repairBackLogisticsCompany + "']").attr("selected","true");
                     $("#repairSendLogisticsCompany option[value='" + repair.repairSendLogisticsCompany + "']").attr("selected","true");
 
@@ -669,31 +670,31 @@
         var repairBackTel = $('#repairBackTel').val();
         //var repairBackMachineNo = $('#repairBackMachineNo').val();
         if (repairBackStatus == 1) {
-            if (repairBackLogisticsNo != null && repairBackLogisticsNo != '') {
-                layer.msg("产品未寄回，不能有物流信息!",{icon: 5,time:500});
-                repair_flag = false;
-                return repair_flag;
-            }
-            if (repairBackPostage != null && repairBackPostage != '') {
-                layer.msg("产品未寄回，不能有邮费!",{icon: 5,time:500});
-                repair_flag = false;
-                return repair_flag;
-            }
-            if (repairBackLogisticsCompany != null && repairBackLogisticsCompany != '') {
-                layer.msg("产品未寄回，不能选择物流公司!",{icon: 5,time:500});
-                repair_flag = false;
-                return repair_flag;
-            }
-            if (repairBackName != null && repairBackName != '') {
-                layer.msg("产品未寄回，不能填写寄回人信息!",{icon: 5,time:500});
-                repair_flag = false;
-                return repair_flag;
-            }
-            if (repairBackTel != null && repairBackTel != '') {
-                layer.msg("产品未寄回，不能填写寄回人电话号码!",{icon: 5,time:500});
-                repair_flag = false;
-                return repair_flag;
-            }
+//            if (repairBackLogisticsNo != null && repairBackLogisticsNo != '') {
+//                layer.msg("产品未寄回，不能有物流信息!",{icon: 5,time:500});
+//                repair_flag = false;
+//                return repair_flag;
+//            }
+//            if (repairBackPostage != null && repairBackPostage != '') {
+//                layer.msg("产品未寄回，不能有邮费!",{icon: 5,time:500});
+//                repair_flag = false;
+//                return repair_flag;
+//            }
+//            if (repairBackLogisticsCompany != null && repairBackLogisticsCompany != '') {
+//                layer.msg("产品未寄回，不能选择物流公司!",{icon: 5,time:500});
+//                repair_flag = false;
+//                return repair_flag;
+//            }
+//            if (repairBackName != null && repairBackName != '') {
+//                layer.msg("产品未寄回，不能填写寄回人信息!",{icon: 5,time:500});
+//                repair_flag = false;
+//                return repair_flag;
+//            }
+//            if (repairBackTel != null && repairBackTel != '') {
+//                layer.msg("产品未寄回，不能填写寄回人电话号码!",{icon: 5,time:500});
+//                repair_flag = false;
+//                return repair_flag;
+//            }
             /*if (repairBackMachineNo != null && repairBackMachineNo != '') {
                 alert("产品未寄回，不能填写机器编号!");
                 repair_flag = false;
@@ -754,16 +755,16 @@
         var repairSendLogisticsCompany = $('#repairSendLogisticsCompany').val();//寄出物流公司
         var repairSendLogisticsNo = $('#repairSendLogisticsNo').val();//寄出物流单号
         if (repairSendLogisticsCompany == 1) {
-            if (repairSendLogisticsCompany != null && repairSendLogisticsCompany != '') {
-                layer.msg("产品未寄送，不能选择物流公司!",{icon: 5,time:500});
-                repair_flag = false;
-                return repair_flag;
-            }
-            if (repairSendLogisticsNo != null && repairSendLogisticsNo != '') {
-                layer.msg("产品未寄送，不能填写物流单号!",{icon: 5,time:500});
-                repair_flag = false;
-                return repair_flag;
-            }
+//            if (repairSendLogisticsCompany != null && repairSendLogisticsCompany != '') {
+//                layer.msg("产品未寄送，不能选择物流公司!",{icon: 5,time:500});
+//                repair_flag = false;
+//                return repair_flag;
+//            }
+//            if (repairSendLogisticsNo != null && repairSendLogisticsNo != '') {
+//                layer.msg("产品未寄送，不能填写物流单号!",{icon: 5,time:500});
+//                repair_flag = false;
+//                return repair_flag;
+//            }
         } else if (repairSendLogisticsCompany == 2 || repairSendLogisticsCompany == 3) {
             if (repairSendLogisticsCompany == null || repairSendLogisticsCompany == '') {
                 layer.msg("请选择寄回物流公司!",{icon: 5,time:500});

watero-rst-web/src/main/webapp/WEB-INF/views/pts/produce/save_produce.ftl

@@ -50,6 +50,15 @@
                         <option value="D">其他(D)</option>
                     </select>
                 </div>
+                <div class="input-box "><span class="input-dic">所属公众号</span>
+                    <select class="" style="width: 290px;" id="wechatMpId" name="wechatMpId">
+                    <#if (listWechatMp?size > 0)>
+                        <#list listWechatMp as list>
+                        <option value="${list.wechatMpId!''}">${list.wechatMpName!''}</option>
+                        </#list>
+                    </#if>
+                    </select>
+                </div>
                 <div class="input-box"><span class="input-dic">产品型号</span><input class="my-input" style="width: 120px;" type="text" name="producePattern" id="producePattern" value="" placeholder="1-3位英文、数字组合" required  maxlength="3" minlength="1"/>-<input class="my-input" style="width: 120px;" type="text" name="produceModel" id="produceModel" value="" placeholder="1-3位英文、数字组合" required  maxlength="3" minlength="1"/>  </div>
 
                 <div class="input-box"><span class="input-dic">产品类型</span>
@@ -214,6 +223,7 @@
         produce.produceFeature = $("[name='produceFeature']").val();//获取产品特性
         produce.producePattern = $("[name='producePattern']").val();//产品型号
         produce.produceModel = $("[name='produceModel']").val();//产品型号
+        produce.wechatMpId = $("[name='wechatMpId']").val();//公众号id
         return produce;
     }
 

watero-rst-web/src/main/webapp/WEB-INF/views/pts/produce/update_produce.ftl

@@ -50,6 +50,17 @@
                     <option value ="D" <#if produce.produceFeature??><#if produce.produceFeature == 'D'>selected="selected"</#if></#if>>其他(D)</option>
                 </select>
             </div>
+
+            <div class="input-box "><span class="input-dic">所属公众号</span>
+                <select class="" style="width: 290px;" id="wechatMpId" name="wechatMpId">
+                <#if (listWechatMp?size > 0)>
+                    <#list listWechatMp as list>
+                        <option value="${list.wechatMpId!''}" <#if produce.wechatMpId??><#if produce.wechatMpId == list.wechatMpId>selected="selected"</#if></#if> >${list.wechatMpName!''}</option>
+                    </#list>
+                </#if>
+                </select>
+            </div>
+
             <div class="input-box"><span class="input-dic">产品型号</span><input class="my-input" style="width: 120px;" type="text" name="producePattern" id="producePattern" placeholder="1-3位英文、数字组合" value="${produce.producePattern!}" placeholder="" required  maxlength="3" minlength="1"/>-
                 <input class="my-input" style="width: 120px;" type="text" name="produceModel" id="produceModel" value="${produce.produceModel!}" placeholder="1-3位英文、数字组合" required  maxlength="3" minlength="1"/>  </div>
 
@@ -234,6 +245,7 @@
         produce.produceFeature = $("[name='produceFeature']").val();//获取产品特性
         produce.producePattern = $("[name='producePattern']").val();//产品型号
         produce.produceModel = $("[name='produceModel']").val();//产品型号
+        produce.wechatMpId = $("[name='wechatMpId']").val();//公众号id
 
         produce.delProcessIds = delProcessIds;    //需要删除的工序id
         produce.delNodeIds = delNodeIds;           //需要删除的工序操作id

watero-rst-web/src/main/webapp/common/js/common/common.js

@@ -174,7 +174,7 @@ function keyFun(node,maxNumber,minNumber){
  * 用于展示错误信息，并让该节点得到焦点
  */
 function vailErrorMsg(node,msg){
-    layer.msg(msg, {icon: 5, time: 5000});
+    layer.msg(msg, {icon: 5, time: 3000});
     node.select();
     window.setTimeout(function(){
         node.focus();