注册页面功能修改

tooth-common-core/src/main/java/com/iamberry/wechat/core/entity/order/NumberBacklogDto.java

@@ -0,0 +1,44 @@
+package com.iamberry.wechat.core.entity.order;
+
+public class NumberBacklogDto {
+
+	private Integer sendTheGoods; //待发货数量
+
+	private Integer returnGoods; // 申请退款数量
+
+	private Integer returnRefund; // 申请退货数量
+
+	private Integer exchange; //申请换货数量
+
+	public Integer getSendTheGoods() {
+		return sendTheGoods;
+	}
+
+	public void setSendTheGoods(Integer sendTheGoods) {
+		this.sendTheGoods = sendTheGoods;
+	}
+
+	public Integer getReturnGoods() {
+		return returnGoods;
+	}
+
+	public void setReturnGoods(Integer returnGoods) {
+		this.returnGoods = returnGoods;
+	}
+
+	public Integer getReturnRefund() {
+		return returnRefund;
+	}
+
+	public void setReturnRefund(Integer returnRefund) {
+		this.returnRefund = returnRefund;
+	}
+
+	public Integer getExchange() {
+		return exchange;
+	}
+
+	public void setExchange(Integer exchange) {
+		this.exchange = exchange;
+	}
+}

tooth-wechat-interface/src/main/java/com/iamberry/wechat/face/order/AdminOrderService.java

@@ -3,6 +3,7 @@ package com.iamberry.wechat.face.order;
 import com.iamberry.wechat.core.entity.admin.ShopSystemRule;
 import com.iamberry.wechat.core.entity.member.CashLog;
 import com.iamberry.wechat.core.entity.member.Member;
+import com.iamberry.wechat.core.entity.order.NumberBacklogDto;
 import com.iamberry.wechat.core.entity.order.Order;
 import com.iamberry.wechat.core.entity.order.OrderItem;
 import com.iamberry.wechat.core.entity.order.OrderRebackMoney;
@@ -214,5 +215,9 @@ public interface AdminOrderService {
 	 * @return
 	 */
 	Integer getNotSendCount(String openid);
-
+	/**
+	 * 首页查询待办数量
+	 * @return
+	 */
+	NumberBacklogDto selectNumberBacklog();
 }

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/ImberryConfig.java

@@ -39,7 +39,8 @@ public class ImberryConfig {
 	public static String INFORM_SHIPPING = "";
 
 	public static String ORDER_UPDATE_STATUS_TEXT = "";
-	
+	/**发送待处理订单信息**/
+	public static String PENDING_ORDER_REMINDER = "";
 	static {
 		Properties pro = new Properties();
 		InputStream in = ImberryConfig.class.getClassLoader().getResourceAsStream("iamberry-app-service-config.properties");
@@ -66,7 +67,8 @@ public class ImberryConfig {
 			LEASE_ORDER_SUCCESS_TEXT = pro.getProperty("LEASE_ORDER_SUCCESS_TEXT");
 			INFORM_SHIPPING = pro.getProperty("INFORM_SHIPPING");
 			ORDER_UPDATE_STATUS_TEXT = pro.getProperty("ORDER_UPDATE_STATUS_TEXT");
-			
+			PENDING_ORDER_REMINDER = pro.getProperty("PENDING_ORDER_REMINDER");
+
 		} catch (Exception e) {
 			e.printStackTrace();
 		}

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/AdminOrderMapper.java

@@ -6,6 +6,7 @@ import java.util.Map;
 import com.iamberry.wechat.core.entity.admin.ShopSystemRule;
 import com.iamberry.wechat.core.entity.drp.PlaceInfo;
 import com.iamberry.wechat.core.entity.member.Member;
+import com.iamberry.wechat.core.entity.order.NumberBacklogDto;
 import com.iamberry.wechat.core.entity.order.Order;
 import com.iamberry.wechat.core.entity.order.OrderItem;
 import com.iamberry.wechat.core.entity.order.OrderRebackMoney;
@@ -204,4 +205,10 @@ public interface AdminOrderMapper {
 	 * @return
 	 */
 	Integer getNotSendCount(String openid);
+
+	/**
+	 * 首页查询待办数量
+	 * @return
+	 */
+	NumberBacklogDto selectNumberBacklog();
 }

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/adminOrderMapper.xml

@@ -762,4 +762,46 @@ PUBLIC
 		ORDER BY ITEM_ID DESC
 	</select>
 
+	<select id="selectNumberBacklog" resultType="NumberBacklogDto">
+		SELECT
+			(CASE WHEN a.sendTheGoods is null THEN 0 ELSE a.sendTheGoods END) as sendTheGoods,
+			(CASE WHEN b.returnGoods is null THEN 0 ELSE b.returnGoods END) as returnGoods,
+			(CASE WHEN c.returnRefund is null THEN 0 ELSE c.returnRefund END) as returnRefund,
+			(CASE WHEN d.exchange is null THEN 0 ELSE d.exchange END) as exchange
+			FROM
+				(
+					(
+						SELECT
+							sum(1) AS sendTheGoods
+						FROM
+							tb_iamberry_shop_sales_order
+						WHERE
+							sales_status = 2
+					) AS a
+					CROSS JOIN (
+						SELECT
+							sum(1) AS returnGoods
+						FROM
+							tb_iamberry_shop_sales_order
+						WHERE
+							sales_status = 3
+					) AS b
+					CROSS JOIN (
+						SELECT
+							sum(1) AS returnRefund
+						FROM
+							tb_iamberry_shop_sales_order
+						WHERE
+							sales_status = 6
+					) AS c
+					CROSS JOIN (
+						SELECT
+							sum(1) AS exchange
+						FROM
+							tb_iamberry_shop_sales_order
+						WHERE
+							sales_status = 11
+					) AS d
+				)
+	</select>
 </mapper>

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/useIntegralMapper.xml

@@ -249,6 +249,9 @@
             <if test="userName!=null and userName != ''">
                 AND  u.user_name like CONCAT('%',#{userName},'%')
             </if>
+            <if test="stayStatus!=null and stayStatus != ''">
+                AND  i.stay_status = #{stayStatus}
+            </if>
             <if test="userNickName!=null and userNickName != ''">
                 AND  u.user_nickname like CONCAT('%',#{userNickName},'%')
             </if>

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/order/AdminOrderServiceImpl.java

@@ -3,6 +3,7 @@ package com.iamberry.wechat.service.order;
 import java.util.*;
 
 import com.iamberry.wechat.core.entity.agentInfo.OrderHint;
+import com.iamberry.wechat.core.entity.order.NumberBacklogDto;
 import com.iamberry.wechat.core.entity.statictics.StatisticsSalesOrder;
 import com.iamberry.wechat.service.mapper.*;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -770,4 +771,9 @@ public class AdminOrderServiceImpl implements AdminOrderService {
 	public Integer getNotSendCount(String openid) {
 		return adminOrderDao.getNotSendCount(openid);
 	}
+
+	@Override
+	public NumberBacklogDto selectNumberBacklog() {
+		return adminOrderDao.selectNumberBacklog();
+	}
 }

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/order/dao/AdminOrderDao.java

@@ -7,6 +7,7 @@ import com.iamberry.wechat.core.entity.admin.ShopSystemRule;
 import com.iamberry.wechat.core.entity.drp.PlaceInfo;
 import com.iamberry.wechat.core.entity.drp.PlaceLogs;
 import com.iamberry.wechat.core.entity.member.Member;
+import com.iamberry.wechat.core.entity.order.NumberBacklogDto;
 import com.iamberry.wechat.core.entity.order.Order;
 import com.iamberry.wechat.core.entity.order.OrderItem;
 import com.iamberry.wechat.core.entity.order.OrderRebackMoney;
@@ -221,5 +222,9 @@ public interface AdminOrderDao {
 	 * @return
 	 */
 	Integer getNotSendCount(String openid);
-
+	/**
+	 * 首页查询待办数量
+	 * @return
+	 */
+	NumberBacklogDto selectNumberBacklog();
 }

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/order/dao/impl/AdminOrderDaoImpl.java

@@ -3,6 +3,7 @@ package com.iamberry.wechat.service.order.dao.impl;
 import java.util.List;
 import java.util.Map;
 
+import com.iamberry.wechat.core.entity.order.NumberBacklogDto;
 import com.iamberry.wechat.core.entity.statictics.StatisticsSalesOrder;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Repository;
@@ -323,4 +324,9 @@ public class AdminOrderDaoImpl implements AdminOrderDao {
 	public Integer getNotSendCount(String openid) {
 		return adminOrderMapper.getNotSendCount(openid);
 	}
+
+	@Override
+	public NumberBacklogDto selectNumberBacklog() {
+		return adminOrderMapper.selectNumberBacklog();
+	}
 }

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/admin/AdminLoginHandler.java

@@ -103,7 +103,7 @@ public class AdminLoginHandler {
 			// 注册二级管理员的权限
 			request.getSession().setAttribute("permission", adminLoginService.selectAdminChildHavePermissionById(adminInfo.getAdminId()));
 		}
-		
+
 		// 登陆成功
 		mv.setViewName("admin/main/index"); // 转向home页
 		AdminUtils.addAdminUserToSession(object, request);

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/admin/AdminOrderHandlers.java

@@ -7,10 +7,7 @@ import com.iamberry.wechat.core.entity.drp.PlaceInfo;
 import com.iamberry.wechat.core.entity.member.CashLog;
 import com.iamberry.wechat.core.entity.member.Member;
 import com.iamberry.wechat.core.entity.mq.MQMessage;
-import com.iamberry.wechat.core.entity.order.MessageDto;
-import com.iamberry.wechat.core.entity.order.Order;
-import com.iamberry.wechat.core.entity.order.OrderActionDto;
-import com.iamberry.wechat.core.entity.order.OrderItem;
+import com.iamberry.wechat.core.entity.order.*;
 import com.iamberry.wechat.core.entity.reback.RebackInfo;
 import com.iamberry.wechat.core.entity.relationship.DealerRelation;
 import com.iamberry.wechat.core.entity.relationship.WdRelation;
@@ -1036,4 +1033,19 @@ public class AdminOrderHandlers {
             return "{\"status\":\"false\",\"info\":\"备注失败，请稍后重试!\"}";
         }
     }
+
+    /**
+     * 查询待发货事项、申请退款订单、申请退货订单、申请换货订单数量
+     */
+    @ResponseBody
+    @RequestMapping(value = "/selectTodo")
+    public ResultMsg selectTodo(HttpServletRequest request){
+        ResultMsg msg = new ResultMsg();
+        //查询待发货事项、申请退款订单、申请退货订单、申请换货订单 的数量
+        NumberBacklogDto numberBacklogDto = adminOrderService.selectNumberBacklog();
+        msg.setResultCode(ResultInfo.SUCCESSCODE);
+        msg.setStatus(true);
+        msg.setData(numberBacklogDto);
+        return msg;
+    }
 }

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/mq/MQTask.java

@@ -1,15 +1,19 @@
 package com.iamberry.wechat.handles.mq;
 
 import java.lang.reflect.Method;
+import java.text.MessageFormat;
 import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.concurrent.locks.Lock;
 import java.util.concurrent.locks.ReentrantLock;
 
 import com.iamberry.wechat.core.entity.admin.ShopSystemRule;
+import com.iamberry.wechat.core.entity.order.NumberBacklogDto;
 import com.iamberry.wechat.face.admin.SystemService;
 import com.iamberry.wechat.face.agentInfo.AgentPurchaseOrderService;
 import com.iamberry.wechat.face.integral.UseIntegralService;
+import com.iamberry.wechat.face.order.AdminOrderService;
+import com.iamberry.wechat.service.ImberryConfig;
 import com.iamberry.wechat.tools.HttpClient431Util;
 import com.iamberry.wechat.tools.NameUtils;
 import com.iamberry.wechat.tools.SendMessageUtil;
@@ -71,6 +75,8 @@ public class MQTask implements InitializingBean {
 	private AgentPurchaseOrderService agentPurchaseOrderService;
 	@Autowired
 	private UseIntegralService useIntegralService;
+	@Autowired
+	private AdminOrderService adminOrderService;
 	
 	private Lock lock = new ReentrantLock();
 
@@ -427,4 +433,19 @@ public class MQTask implements InitializingBean {
 		useIntegralService.updateIntegralStayToAlready();
 	}
 
+	/**
+	 * 待处理订单提醒（每天下午2:50点，短信提醒益霜、上朵运营一次（15814645335、13472545449）
+	 */
+	@SuppressWarnings(value = {"unchecked", "rawtypes"})
+	/*@Scheduled(cron = "0 0/3 * * * ?")//每三分钟执行一次*/
+	@Scheduled(cron = "0 50 14 * * ? *")//每三分钟执行一次
+	public void pendingOrderReminder() {
+		//查询待发货事项、申请退款订单、申请退货订单、申请换货订单 的数量
+		NumberBacklogDto numberBacklogDto = adminOrderService.selectNumberBacklog();
+		Integer num = (numberBacklogDto.getExchange()+numberBacklogDto.getReturnGoods()+numberBacklogDto.getReturnRefund()+numberBacklogDto.getSendTheGoods());
+		String text = MessageFormat.format(ImberryConfig.PENDING_ORDER_REMINDER, num);
+		codeService.informShipping("15814645335", text);
+		codeService.informShipping("13472545449", text);
+	}
+
 }

tooth-wechat-web/src/main/resources/iamberry-app-service-config.properties

@@ -24,3 +24,4 @@ PROBATION_SUCCESS_SECOND_TEXT=\u3010\u7F8E\u56FDWatero\u3011\u5C0A\u656C\u7684\u
 PROBATION_SUCCESS_THIRD_TEXT=\u3010\u7F8E\u56FDWatero\u3011\u5C0A\u656C\u7684\u4F1A\u5458\u60A8\u597D\uFF01\u60A8\u7684\u8BD5\u7528\u8BA2\u53552\u5929\u540E\u5C06\u5230\u671F\uFF0C\u540C\u65F6\uFF0C\u8FD8\u67091L\u7CBE\u7F8E\u91CF\u676F\u5F85\u9886\u53D6\uFF0C\u8BF7\u8FDB\u5165\u5FAE\u4FE1\u516C\u4F17\u53F7\u67E5\u770B\u8BA2\u5355\u3002
 INFORM_SHIPPING=\u3010\u4E0A\u6735\u5FAE\u5546\u57CE\u3011\u4EB2\uFF0C\u60A8\u7684\u8BA2\u5355\u5DF2\u53D1\u8D27\u3002\u5173\u6CE8\u201C\u4E0A\u6735\u5FAE\u5546\u57CE\u201D\u516C\u4F17\u53F7\u53EF\u67E5\u8BE2\u7269\u6D41\u4FE1\u606F
 ORDER_UPDATE_STATUS_TEXT=\u3010\u4E0A\u6735\u5FAE\u5546\u57CE\u3011\u6709\u4E00\u4E2A\u8BA2\u5355\u5F85{0}\uFF0C\u8BF7\u767B\u9646\u4E0A\u6735\u5FAE\u4FE1\u540E\u53F0\u5904\u7406\u3002
+PENDING_ORDER_REMINDER=\u3010soodo\u4E0A\u6735\u3011\u60A8\u6709{0}\u4E2A\u5F85\u53D1\u8D27\u8BA2\u5355\u5904\u7406\u3002

tooth-wechat-web/src/main/resources/iamberry-wechat-service-mybatis.xml

@@ -132,7 +132,8 @@
 		<typeAlias type="com.iamberry.wechat.core.entity.wx.ZTreeBean" alias="ZTreeBean"/>
 		<typeAlias type="com.iamberry.wechat.core.entity.drp.ApplyPlaceLogs" alias="ApplyPlaceLogs"/>
 		<typeAlias type="com.iamberry.wechat.core.entity.wx.WechatShare" alias="WechatShare"/>
-	
+		<typeAlias type="com.iamberry.wechat.core.entity.order.NumberBacklogDto" alias="NumberBacklogDto"/>
+
 		<!-- 【门店关注统计报表类】 -->
 		<typeAlias type="com.iamberry.wechat.core.entity.statictics.AttentionInfo" alias="AttentionInfo"/>
 		<typeAlias type="com.iamberry.wechat.core.entity.statictics.MarketInfo" alias="MarketInfo"/>

tooth-wechat-web/src/main/webapp/WEB-INF/views/admin/integralRecord/listStayIntegral.jsp

@@ -47,12 +47,22 @@
 				</select>
 			</span>
         </div>
-
+        <div class="formControls col-2">
+			 <span class="select-box">
+				<select id="stayStatus" name="stayStatus" class="select">
+					<option value="" >待入积分状态</option>
+					<option value="1" ${stayStatus=='1'?'selected':''}>待入账</option>
+					<option value="2" ${stayStatus=='2'?'selected':''}>已入账</option>
+					<option value="3" ${stayStatus=='3'?'selected':''}>订单取消/退货,撤回</option>
+					<option value="4" ${stayStatus=='4'?'selected':''}>取消</option>
+				</select>
+			</span>
+        </div>
         <input name="userName" id="userName" value="${userName }" placeholder="会员姓名搜索" style="width: 150px" class="input-text" type="text">
 
         <input name="userNickName" id="userNickName" value="${userNickName }" placeholder="微信昵称搜索" style="width: 150px" class="input-text" type="text">
 
-        <input  id="beginDate" value="<fmt:formatDate value="${stayRecordedTime}" pattern="yyyy-MM-dd"/>" name="stayRecordedTime" class="input-text Wdate" placeholder="请选择入账日期" style="width: 150px;" type="text" onfocus="WdatePicker({dateFmt:'yyyy-MM-dd',maxDate:'2020-10-01'})" readonly>
+        <input  id="beginDate" value="<fmt:formatDate value="${stayRecordedTime}" pattern="yyyy-MM-dd"/>" name="stayRecordedTime" class="input-text Wdate" placeholder="请选择入账日期" style="width: 150px;" type="text" onfocus="WdatePicker({dateFmt:'yyyy-MM-dd',maxDate:'2020-10-01'})" readonly><br>
         <input name="changeIntegralMin" id="changeIntegralMin" value="${changeIntegralMin }" placeholder="变动积分数量" style="width: 150px" class="input-text" type="text" onkeyup="value=value.replace(/[^\d]/g,'')">-
         <input name="changeIntegralMax" id="changeIntegralMax" value="${changeIntegralMax }" placeholder="变动积分数量" style="width: 150px" class="input-text" type="text" onkeyup="value=value.replace(/[^\d]/g,'')">
 

tooth-wechat-web/src/main/webapp/WEB-INF/views/admin/main/index.jsp

@@ -118,9 +118,20 @@
 			<div class="show_iframe">
 				<div style="display: none" class="loading"></div>
 				<%--<iframe scrolling="yes" frameborder="0" src="${pageContext.request.contextPath }/admin/orderStatistics/_sales_order_statistics"></iframe>--%>
-				<iframe scrolling="yes" frameborder="0" src="${pageContext.request.contextPath }/common/admin/welcome/welcome.html"></iframe>
+				<iframe id="indexframe" scrolling="yes" frameborder="0" src="${pageContext.request.contextPath }/common/admin/welcome/welcome.html"></iframe>
 			</div>
 		</div>
+
+		<div id="selectTodo" class="menu_dropdown bk_2" style="display:none">
+			<div>
+				<%--<a data-id="${pageContext.request.contextPath }/admin/order/selectShopOrder?orderStatus=paySuccess" data-title="订单管理" href="javascript:;" class="J_menuTab" ><span>（</span><span id="sendTheGoods" style="color: #f00">0</span><span>）待发货订单</span></a><br>--%>
+				<a onclick="toOrserList('${pageContext.request.contextPath }/admin/order/selectShopOrder?orderStatus=paySuccess')"  ><span>（</span><span id="sendTheGoods" style="color: #f00">0</span><span>）待发货订单</span></a><br>
+				<a onclick="toOrserList('${pageContext.request.contextPath }/admin/order/selectShopOrder?orderStatus=returnOrder')"  ><span>（</span><span id="returnGoods" style="color: #f00">0</span><span>）申请退款订单</span></a><br>
+				<a onclick="toOrserList('${pageContext.request.contextPath }/admin/order/selectShopOrder?orderStatus=returnOrderEtc')"  ><span>（</span><span id="returnRefund" style="color: #f00">0</span><span>）申请退货订单</span></a><br>
+				<a onclick="toOrserList('${pageContext.request.contextPath }/admin/order/selectShopOrder?orderStatus=inOrder')"  ><span>（</span><span id="exchange" style="color: #f00">0</span><span>）申请换货订单</span></a>
+			</div>
+		</div>
+
 	</section>
 	<script type="text/javascript"
 		src="${pageContext.request.contextPath }/common/admin/lib/jquery/1.9.1/jquery.min.js"></script>
@@ -130,6 +141,60 @@
 		src="${pageContext.request.contextPath }/common/admin/js/H-ui.js"></script>
 	<script type="text/javascript"
 		src="${pageContext.request.contextPath }/common/admin/js/H-ui.admin.js"></script>
-	
+
+<script>
+
+
+        $.ajax({
+            "type" : "post",
+            "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
+    });
+    function toOrserList(url){
+        $("#min_title_list li").remove();
+        $("#min_title_list").append('<li class="active"><span data-href="/admin/order/selectShopOrder">订单管理</span><i></i><em></em></li>')
+
+		$("#indexframe").attr("src",url);
+
+
+	}
+
+        function Hui_admin_tab(obj){
+            if($(obj).attr('_href')){
+                var bStop=false;
+                var bStopIndex=0;
+                var _href = $(obj).attr('_href');
+                _href += "?" + index++;
+                var topWindow=$(window.parent.document);
+                var childs = obj.parentNode.parentNode.childNodes;//获得爷爷辈的节点
+                for (var i = childs.length - 1; i >= 0; i--) {//清除所有父节点级所有样式
+                    childs[i].className = "";
+                }
+                obj.parentNode.className="current";//把自己爹样式设置上
+                var iframe_box=topWindow.find("#iframe_box");//获取Iframe
+                iframe_box.find(".show_iframe").hide().eq(bStopIndex).show().find("iframe").attr("src",_href);//将连接的网页装载到Iframe
+            }
+        }
+</script>
 </body>
 </html>

tooth-wechat-web/src/main/webapp/view/view_logistics.html

@@ -142,7 +142,7 @@
 </div> -->
 <div class="mui-content" style="background: #fff;">
     <div style="position: relative;height: 100px;padding:20px 15px;background: #6bc5e3;">
-        <img style="float: left;" width="60px" src="//s.iamberry.com/tooth/new/images/logistics.png">
+        <img style="float: left;" width="60px" src="//s.iamberry.com/tooth/new/images/logistics.jpg">
         <ul style="display: inline-block;float: left;text-align: left;color: #fff;line-height: 30px;padding: 0 0 0 10px;">
             <li id="billName"></li>
             <li>单号：<span id="billCode"></span></li>