Merge remote-tracking branch 'origin/base-modify' into base-modify

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/BaseUserMemberExportBiz.java

@@ -21,10 +21,7 @@ import org.springframework.transaction.annotation.Transactional;
 import tk.mybatis.mapper.entity.Example;
 
 import java.time.Instant;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -78,6 +75,7 @@ public class BaseUserMemberExportBiz extends BaseBiz<BaseUserMemberExportMapper,
                     .status(phoneAndUserIdMap == null ? 0 : (phoneAndUserIdMap.get(userMemberSaveDTO.getPhone()) == null ? 0 : 1))
                     .crtId(userId)
                     .crtName(name)
+                    .crtTime(Instant.now().toEpochMilli())
                     .isDel(0)
                     .build();
             if (log.isDebugEnabled()) {
@@ -188,6 +186,7 @@ public class BaseUserMemberExportBiz extends BaseBiz<BaseUserMemberExportMapper,
             BeanUtils.copyProperties(userMemberExportDTO,baseUserMemberExportVo);
             baseUserMemberExportVos.add(baseUserMemberExportVo);
         }
+        baseUserMemberExportVos.sort(Comparator.comparing(BaseUserMemberExportVo::getCrtTime).reversed());
         baseUserMemberExportVoPageDataVO.setData(baseUserMemberExportVos);
         baseUserMemberExportVoPageDataVO.setPageNum(baseUserMemberExportDataDTOS.getPageNum());
         baseUserMemberExportVoPageDataVO.setPageSize(baseUserMemberExportDataDTOS.getPageSize());

ace-modules/ace-admin/src/main/resources/mapper/BaseUserMemberExportMapper.xml

@@ -32,7 +32,7 @@
            </if>
           <if test="endTime != null and startTime == null">
               and <![CDATA[ `crt_time` <= #{startTime}]]>
-          </if>
+          </if> order  by `crt_time`  DESC
     </select>
 
     <update id="updateUserMemberExportDataStatusById">

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/dto/CouponFindDTO.java

+package com.xxfc.platform.activity.dto;
+
+import com.github.wxiaoqi.security.common.vo.PageParam;
+import lombok.Data;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/7/23 10:41
+ */
+@Data
+public class CouponFindDTO  extends PageParam {
+
+     private String title;
+
+     private Integer type;
+}

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/vo/CouponPagVo.java

+package com.xxfc.platform.activity.vo;
+
+import lombok.Data;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/7/23 10:55
+ */
+@Data
+public class CouponPagVo {
+
+}

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/rest/admin/CouponAdminController.java

+package com.xxfc.platform.activity.rest.admin;
+
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.xxfc.platform.activity.biz.CouponBiz;
+import com.xxfc.platform.activity.dto.CouponFindDTO;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/7/23 10:39
+ */
+@RestController
+@RequestMapping("/admin/coupon")
+public class CouponAdminController {
+
+       @Autowired
+       private CouponBiz couponBiz;
+
+    @GetMapping("/page")
+    public ObjectRestResponse listCouponWithPage(CouponFindDTO couponFindDTO){
+
+
+        return ObjectRestResponse.succ();
+    }
+}

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BaseOrderController.java

@@ -18,6 +18,7 @@ import com.github.wxiaoqi.security.common.util.ClientUtil;
 import com.github.wxiaoqi.security.common.util.Query;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
+import com.xxfc.platform.activity.user.UserInfoBiz;
 import com.xxfc.platform.order.biz.BaseOrderBiz;
 import com.xxfc.platform.order.biz.OrderMemberDetailBiz;
 import com.xxfc.platform.order.biz.OrderUserLicenseBiz;
@@ -46,14 +47,18 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Controller;
 import org.springframework.web.bind.annotation.*;
+import org.springframework.web.context.request.RequestContextHolder;
+import org.springframework.web.context.request.ServletRequestAttributes;
 
 import javax.annotation.Resource;
+import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
 import java.util.Date;
 import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
+import static com.github.wxiaoqi.security.auth.common.constatns.CommonConstants.DATA_ALL_FALSE;
 import static com.xxfc.platform.universal.constant.DictionaryKey.APP_ORDER;
 
 @Controller
@@ -150,7 +155,7 @@ public class BaseOrderController extends CommonBaseController implements UserRes
     @ApiOperation(value = "获取后台订单列表")
     @IgnoreClientToken
     @CrossOrigin
-    public ObjectRestResponse<PageDataVO<OrderListVo>> selectByUser(QueryOrderList dto) {
+    public ObjectRestResponse<PageDataVO<OrderListVo>> selectByUser(QueryOrderList dto, HttpServletRequest request) {
         if (dto.getStartTime() != null) {
             if (dto.getEndTime() == null) {
                 dto.setEndTime(new Date().getTime());
@@ -162,6 +167,19 @@ public class BaseOrderController extends CommonBaseController implements UserRes
                 dto.setUserId(appUserLogin.getId());
             }
         }
+
+        UserDTO userDTO = getAdminUserInfo();
+        if(userDTO == null) {
+            return ObjectRestResponse.succ(new PageDataVO<>());
+        }
+        if(DATA_ALL_FALSE.equals(userDTO.getDataAll())) { //不能获取全部数据
+            if(StringUtils.isNotBlank(userDTO.getDataZone())) {
+               dto.setStartZoneId(userDTO.getZoneId());
+            }
+            if(StringUtils.isNotBlank(userDTO.getDataCompany())) {
+                dto.setStartCompanyId(userDTO.getCompanyId());
+            }
+        }
         Query query = new Query(dto);
         PageDataVO pageDataVO = PageDataVO.pageInfo(query, () -> baseOrderBiz.listOrder(query.getSuper()));
         List<OrderListVo> list = pageDataVO.getData();
@@ -413,7 +431,13 @@ public class BaseOrderController extends CommonBaseController implements UserRes
         rabbitProduct.sendDelayMessage(baseOrderBiz.selectById(93), 1000L * 60);
         return ObjectRestResponse.succ();
     }
-
+    public UserDTO getAdminUserInfo() {
+        HttpServletRequest request = ((ServletRequestAttributes) RequestContextHolder.getRequestAttributes()).getRequest();
+        if(request.getHeader("Authorization") !=null) {
+            return userFeign.userinfoByToken(request.getHeader("Authorization")).getData();
+        }
+        return null;
+    }
 
 
     /**