Merge remote-tracking branch 'origin/master'

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/web/controller/MenuController.java

@@ -40,6 +40,9 @@ public class MenuController extends BaseController {
 //        if(menuByPermission != null){
 //            return failed("权限标识不能重复");
 //        }
+        if (sysMenu.getParentId() == null) {
+            sysMenu.setParentId(0L);
+        }
         return succeed(sysMenuService.insert(sysMenu));
     }
 

cooleshow-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/controller/AdminStatisticalController.java

@@ -30,6 +30,8 @@ public class AdminStatisticalController {
     private OmsOrderService orderService;
 
 
+     // 弃用
+    @Deprecated
     @ApiOperation("商城用户统计")
     @RequestMapping(value = "/user", method = RequestMethod.POST)
     @ResponseBody

cooleshow-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/controller/OmsOrderController.java

@@ -6,12 +6,15 @@ import com.yonge.cooleshow.admin.dto.*;
 import com.yonge.cooleshow.mbg.model.OmsOrder;
 import com.yonge.cooleshow.admin.service.OmsOrderService;
 import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 订单管理Controller
@@ -34,6 +37,19 @@ public class OmsOrderController {
         return CommonResult.success(CommonPage.restPage(orderList));
     }
 
+    @ApiOperation("远程查询订单成功的用户和时间信息")
+    @PostMapping(value = "/userOrderInfoList")
+    @ApiImplicitParams({
+            @ApiImplicitParam(name = "startTime", dataType = "LocalDateTime", value = "订单开始时间", required = true),
+            @ApiImplicitParam(name = "endTime", dataType = "LocalDateTime", value = "订单结束时间",required = true),
+            @ApiImplicitParam(name = "userIdList", dataType = "List", value = "用户id集合",required = true),
+    })
+    @ResponseBody
+    public CommonResult<List<Map<String,Object>>> userOrderInfoList(@RequestBody Map<String,Object> param) {
+        List<Map<String,Object>> orderList = orderService.userOrderInfoList(param);
+        return CommonResult.success(orderList);
+    }
+
     @ApiOperation("批量发货")
     @RequestMapping(value = "/update/delivery", method = RequestMethod.POST)
     @ResponseBody

cooleshow-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/dao/OmsOrderDao.java

@@ -8,6 +8,7 @@ import com.yonge.cooleshow.mbg.model.OmsOrder;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 订单查询自定义Dao
@@ -29,5 +30,7 @@ public interface OmsOrderDao {
      */
     OmsOrderDetail getDetail(@Param("id") Long id);
 
-    void userStatistical(@Param("search") UserStatisticalSearch search);
+
+
+    List<Map<String,Object>> getUserOrderInfoList(Map<String, Object> param);
 }

cooleshow-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/service/OmsOrderService.java

@@ -7,6 +7,7 @@ import com.yonge.cooleshow.admin.dto.*;
 import org.springframework.transaction.annotation.Transactional;
 
 import java.util.List;
+import java.util.Map;
 
 /**
  * 订单管理Service
@@ -64,4 +65,15 @@ public interface OmsOrderService {
      * @param search 参数
      */
     void userStatistical(UserStatisticalSearch search);
+
+    /**
+     * 远程查询订单成功的用户和时间信息
+     *
+     * @param param
+     *            -- startTime   订单完成开始时间
+     *            -- endTime 订单完成结束时间
+     *            -- userIdList 用户id集合
+     * @return
+     */
+    List<Map<String,Object>> userOrderInfoList(Map<String, Object> param);
 }

cooleshow-mall/mall-admin/src/main/java/com/yonge/cooleshow/admin/service/impl/OmsOrderServiceImpl.java

@@ -17,6 +17,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.Date;
 import java.util.List;
+import java.util.Map;
 import java.util.stream.Collectors;
 
 /**
@@ -155,6 +156,11 @@ public class OmsOrderServiceImpl implements OmsOrderService {
 
     @Override
     public void userStatistical(UserStatisticalSearch search) {
-        orderDao.userStatistical(search);
+        // orderDao.userStatistical(search);
+    }
+
+    @Override
+    public List<Map<String,Object>> userOrderInfoList(Map<String, Object> param) {
+        return orderDao.getUserOrderInfoList(param);
     }
 }

cooleshow-mall/mall-admin/src/main/resources/config/mybatis/OmsOrderDao.xml

@@ -88,7 +88,26 @@
         ORDER BY oi.id ASC,oh.create_time DESC
     </select>
 
-    <select id="userStatistical" resultType="void">
 
+
+    <select id="getUserOrderInfoList" resultType="java.util.Map">
+        select member_id as userId,
+        min(receive_time) as receiveTime
+        from oms_order
+        <where>
+            <if test="startTime != null and startTime !=''">
+                and receive_time &gt;= #{startTime}
+            </if>
+            <if test="endTime != null and endTime != ''">
+                and receive_time &lt;= #{endTime}
+            </if>
+            <if test="userIdList != null and userIdList.size() != 0">
+                and member_id in
+                <foreach collection="userIdList" separator="," close=")" open="(" item="item">
+                    #{item}
+                </foreach>
+            </if>
+        </where>
+        group by member_id
     </select>
 </mapper>