liujiankang 7 gadi atpakaļ
vecāks
revīzija
800a50296f

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

@@ -144,4 +144,6 @@ public interface CustomerService {
 
     /*删除旧的售后信息*/
     void deleteCustomerAfterSales(CustomerInfo customer);
+
+    Integer selectNotSolvedCustomer();
 }

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

@@ -586,6 +586,14 @@ public class CustomerServiceImpl implements CustomerService {
         }
     }
 
+    @Override
+    public Integer selectNotSolvedCustomer() {
+        CustomerInfo customerInfo = new CustomerInfo();
+        customerInfo.setCustomerIsSolve(2);
+        List<CustomerInfo> listCustomer = customerInfoMapper.listCustomer(customerInfo);
+        return listCustomer.size();
+    }
+
     /**
      * 产品配件初始化
      * @param cc

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

@@ -16,9 +16,11 @@ import com.iamberry.rst.util.CustomerCommonUtil;
 import com.iamberry.rst.util.SmsConfig;
 import com.iamberry.rst.utils.AdminUtils;
 import com.iamberry.rst.utils.OrderNoUtil;
+import com.iamberry.rst.utils.ResultMsg;
 import com.iamberry.rst.utils.StitchAttrUtil;
 import com.iamberry.wechat.tools.NameUtils;
 import com.iamberry.wechat.tools.ResponseJson;
+import com.iamberry.wechat.tools.ResultInfo;
 import net.sf.json.JSONArray;
 import org.apache.commons.codec.binary.Base64;
 import org.apache.commons.lang.StringUtils;
@@ -1650,5 +1652,28 @@ public class AdminCustomerController {
             return new ResponseJson(500, "修改失败!", 500);
         }
     }
+
+    /**
+     * 查询未解决客诉数量
+     */
+    @ResponseBody
+    @RequestMapping(value = "/selectTodo")
+    public ResultMsg selectTodo(HttpServletRequest request){
+        ResultMsg msg = new ResultMsg();
+        CustomerInfo customerInfo = new CustomerInfo();
+        customerInfo.setCustomerIsSolve(2);
+        //未解决客诉数量
+        Integer notSolvedCustomer = customerService.selectNotSolvedCustomer();
+        //需要向工厂确认所有已签收的产品数量
+
+        //需要填写Efast订单号的客诉数量
+
+        //客诉录入后,三天后未寄回的客诉数量
+
+        msg.setResultCode(ResultInfo.SUCCESSCODE);
+        msg.setStatus(true);
+        msg.setData(null);
+        return msg;
+    }
 }
 

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

@@ -71,7 +71,7 @@ public class MQTask implements InitializingBean {
 	@Autowired
 	private ReissueService reissueService;
 	@Autowired
-	private CustomerInfoMapper customerInfoMapper;
+	private CustomerService customerService;
 	@Autowired
 	private SysConfigService sysConfigService;
 
@@ -340,7 +340,7 @@ public class MQTask implements InitializingBean {
 				&& customerId > 0 && !tel.equals("")){
 			postFirm =  KuaiDi100.replace(postFirm);
 			if(!postFirm.equals("")){
-				ProductType productType = customerInfoMapper.getcompanyAffiliation(customerId);
+				ProductType productType = customerService.getcompanyAffiliation(customerId);
 				if(productType != null){
 					String rejected_text = "";
 					//1:美国watero; 2:上朵电动牙刷  3:优尼雅净水机

+ 39 - 0
watero-rst-web/src/main/webapp/WEB-INF/views/home/pc_index.ftl

@@ -90,6 +90,16 @@
             <iframe scrolling="yes" frameborder="0" src="${path}/common/static/welcome/welcome.html"></iframe>
         </div>
     </div>
+
+    <div id="selectTodo" class="menu_dropdown bk_2" style="display:none">
+        <div>
+
+            <a onclick="toOrserList('${path}/admin/order/selectShopOrder?orderStatus=paySuccess')"  ><span>(</span><span id="sendTheGoods" style="color: #f00">0</span><span>)待发货订单</span></a><br>
+            <a onclick="toOrserList('${path}/admin/order/selectShopOrder?orderStatus=returnOrder')"  ><span>(</span><span id="returnGoods" style="color: #f00">0</span><span>)申请退款订单</span></a><br>
+            <a onclick="toOrserList('${path}/admin/order/selectShopOrder?orderStatus=returnOrderEtc')"  ><span>(</span><span id="returnRefund" style="color: #f00">0</span><span>)申请退货订单</span></a><br>
+            <a onclick="toOrserList('${path}/admin/order/selectShopOrder?orderStatus=inOrder')"  ><span>(</span><span id="exchange" style="color: #f00">0</span><span>)申请换货订单</span></a>
+        </div>
+    </div>
 </section>
 
 <div class="contextMenu" id="Huiadminmenu">
@@ -100,4 +110,33 @@
 </div>
 </body>
 <script type="text/javascript" src="${path}/common/js/index/index.js"></script>
+<script type="text/javascript" src="${path}/common/lib/layer/2.4/layer.js"></script>
+<script>
+    $.ajax({
+        "type" : "post",
+        "url" : "/tooth/admin/order/selectTodo",
+        /*"url" : "/admin/order/selectTodo",*/
+        "dataType" : "json",
+        async:false,
+        "success" : function(data) {
+            if(data.status){
+                $("#sendTheGoods").html(data.data.sendTheGoods);
+                $("#returnGoods").html(data.data.returnGoods);
+                $("#returnRefund").html(data.data.returnRefund);
+                $("#exchange").html(data.data.exchange);
+            }
+        },
+        "error":function(data){
+            alert("操作失败,请联系管理员!");
+        }
+    });
+    //页面层
+    layer.open({
+        type: 1,
+        area: ['300px', '180px'], //宽高
+        content: $("#selectTodo").html(),
+        offset: 'rb',
+        shade: 0
+    });
+</script>
 </html>