上朵分销系统

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

@@ -65,6 +65,7 @@
                 AND t.reback_channel_type = #{rebackChannelType}
             </if >
         </where>
+       ORDER BY  t.rebate_id DESC
     </select>
     <select id="getChannelRebateById" resultMap="BaseResultMap" parameterType="Integer" >
         select

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

@@ -98,6 +98,7 @@
             </if >
         </where>
         GROUP BY child_channel_id
+        ORDER BY  t.child_channel_id DESC
     </select>
     <select id="getChildChannelById" resultMap="BaseResultMap" parameterType="Integer" >
         select

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

@@ -71,6 +71,7 @@
         </where>
         GROUP BY
         t.main_channel_id
+        ORDER BY t.main_channel_id DESC
     </select>
     <select id="getMainChannelById" resultType="MainChannel" parameterType="Integer" >
         select

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/channel/ChannelAdminHandler.java

@@ -66,6 +66,8 @@ public class ChannelAdminHandler {
     ) throws Exception {
         ResultMsg msg = ResultMsg.getError();
 
+        Integer status = order.getSalesStatus();
+
         // 用户信息
         String openId  = WechatUtils.getUserBySession(request).getUserOpenid();
 
@@ -86,7 +88,13 @@ public class ChannelAdminHandler {
             ids.add(channelAdminList.get(i).getChannelId());
         }
         order.setChannelIds(ids);
-        order.setSalesTransportationType(2);
+
+        if(order.getSalesStatus() == 99){
+            order.setSalesStatus(null);
+            order.setSalesTransportationType(null);
+        }else{
+            order.setSalesTransportationType(2);
+        }
 
         // 封装请求数据
         PageRequest<Order> pageRequest = new PageRequest<>(order, pageNO, pageSize, totalNum == 0);
@@ -96,6 +104,14 @@ public class ChannelAdminHandler {
 
         List<Order> orderList = result.getDataList();
         for (Order or :orderList) {
+            if(status == 99 && or.getSalesTransportationType() == 1){
+                String name = or.getSalesAddressName();
+                name = name.substring(0,1) + "**";
+                String tel = or.getSalesAddressTel();
+                tel = tel.substring(0,3) + "****" + tel.substring(7,11) ;
+                or.setSalesAddressName(name);
+                or.setSalesAddressTel(tel);
+            }
             List<OrderItem>orderItemList = adminOrderService.getShopOrderItemByOrderId(or.getSalesOrderid());
             or.setOrderItemList(orderItemList);
         }
@@ -107,12 +123,16 @@ public class ChannelAdminHandler {
         Integer dfStatus = channelAdminService.listOrderCount(or);
         or.setSalesStatus(5);
         Integer yfStatus = channelAdminService.listOrderCount(or);
+        or.setSalesStatus(null);
+        or.setSalesTransportationType(null);
+        Integer allStatus = channelAdminService.listOrderCount(or);
 
         Map<String,Object> map = new HashMap<>();
         map.put("orderList",orderList);
         map.put("lastPage",lastPage);
         map.put("dfStatus",dfStatus);
         map.put("yfStatus",yfStatus);
+        map.put("allStatus",allStatus);
 
         msg = ResultMsg.getSuccess();
         msg.setData(map);

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/coupon/CouponTypeHandler.java

@@ -550,7 +550,7 @@ public class CouponTypeHandler {
 				if (activityList != null && activityList.size() > 0) {
 					Activity ac = activityList.get(0);
 					CouponItemDto ci = couponItemDtoList.get(0);
-					if(ac.getActivityCoupon().equals(ci.getCouponItemId()) ){
+					if(ci.getCouponItemId().equals(ac.getActivityCoupon())){
 						flag = true;
 					}else{
 						flag = false;

tooth-wechat-web/src/main/java/com/iamberry/wechat/handles/wx/QrCodeHandler.java

@@ -20,6 +20,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 
 /**
@@ -60,9 +61,15 @@ public class QrCodeHandler {
         }
         //查询用户信息
         memberInfo = memberService.getMemberByUserOpenId(memberInfo.getUserOpenid());
+
+        Apparatus appar = new Apparatus();
+        appar.setUserOpenid(memberInfo.getUserOpenid());
+        List<Apparatus> apparatusList = apparatusService.listApparatusPage(appar);
+
         Map<String,Object> map = new HashMap<String, Object>();
         map.put("memberInfo",memberInfo);
         map.put("isActivation",isActivation);
+        map.put("memberToothNumber",apparatusList.size());
         msg.setData(map);
         msg.setResultCode(ResultInfo.SUCCESSCODE);
         msg.setStatus(true);