Merge branch 'dev' of http://113.105.137.151:22280/youjj/cloud-platform into dev

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/BaseUserMemberLevel.java

 package com.github.wxiaoqi.security.admin.entity;
 
-import java.io.Serializable;
-import java.math.BigDecimal;
-import java.util.Date;
-import javax.persistence.*;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.math.BigDecimal;
+
 
 /**
  * 会员等级表
@@ -75,6 +78,9 @@ public class BaseUserMemberLevel implements Serializable {
 	@Column(name = "number")
 	@ApiModelProperty(value = "赠送免费天数")
 	private Integer number;
-	
+
+	@Column(name = "big_icon")
+	@ApiModelProperty(value = "大图标")
+	private String bigIcon;
 
 }

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/dto/AppUserDTO.java

@@ -83,6 +83,7 @@ public class AppUserDTO {
 	private String memberName;
 	//图标
 	private String icon;
+	private String bigIcon;
 	private Integer memberNo;
 	private Long cardLeave;
 	private Integer isBind;

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

@@ -4,10 +4,8 @@ import com.github.wxiaoqi.security.admin.dto.BaseUserMemberExportDTO;
 import com.github.wxiaoqi.security.admin.dto.BaseUserMemberExportDataFindDTO;
 import com.github.wxiaoqi.security.admin.dto.UserMemberDTO;
 import com.github.wxiaoqi.security.admin.dto.UserMemberSaveDTO;
-import com.github.wxiaoqi.security.admin.entity.BaseUserMember;
 import com.github.wxiaoqi.security.admin.entity.BaseUserMemberExport;
 import com.github.wxiaoqi.security.admin.entity.BaseUserMemberLevel;
-import com.github.wxiaoqi.security.admin.entity.UserMemberLevel;
 import com.github.wxiaoqi.security.admin.mapper.BaseUserMemberExportMapper;
 import com.github.wxiaoqi.security.admin.vo.BaseUserMemberExportVo;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;

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

@@ -2,9 +2,9 @@ package com.github.wxiaoqi.security.admin.biz;
 
 import com.ace.cache.annotation.Cache;
 import com.github.wxiaoqi.security.admin.entity.BaseUserMemberLevel;
-import com.github.wxiaoqi.security.admin.entity.UserMemberLevel;
 import com.github.wxiaoqi.security.admin.mapper.BaseUserMemberLevelMapper;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.github.wxiaoqi.security.common.exception.BaseException;
 import org.apache.commons.collections.CollectionUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Propagation;
@@ -51,4 +51,11 @@ public class UserMemberLevelBiz extends BaseBiz<BaseUserMemberLevelMapper,BaseUs
        }
        return levelAndDiscountMap;
     }
+
+    public void updateMemberBaseInfo(BaseUserMemberLevel baseUserMemberLevel) {
+        int affectRows = mapper.updateByPrimaryKeySelective(baseUserMemberLevel);
+        if (affectRows==0){
+            throw new BaseException("更新会员等级失败");
+        }
+    }
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/AppUserController.java

@@ -153,6 +153,7 @@ public class AppUserController extends CommonBaseController{
                 if (memberLevel!=null){
                     String icon=memberLevel.getIcon();
                     userDTO.setIcon(icon);
+                    userDTO.setBigIcon(memberLevel.getBigIcon());
                 }
             }
         }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/MemberLevelController.java

@@ -74,4 +74,8 @@ public class MemberLevelController extends BaseController<UserMemberLevelBiz, Ba
         return ObjectRestResponse.succ();
     }
 
+    @PutMapping("/update")
+    public void updateMemberBaseInfo(@RequestBody BaseUserMemberLevel baseUserMemberLevel){
+        getBaseBiz().updateMemberBaseInfo(baseUserMemberLevel);
+    }
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/admin/UserMemberAdminController.java

@@ -21,7 +21,6 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.charset.Charset;

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderStatisticsBiz.java

 package com.xxfc.platform.order.biz;
 
 import cn.hutool.core.collection.CollectionUtil;
-import cn.hutool.core.date.DateUtil;
 import cn.hutool.db.PageResult;
-import com.github.pagehelper.Page;
 import com.github.wxiaoqi.security.admin.entity.BaseUserMemberLevel;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.exception.BaseException;
-import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.google.common.collect.Maps;
-import com.google.common.collect.Ordering;
 import com.xxfc.platform.order.Utils.OrderDateUtils;
 import com.xxfc.platform.order.contant.enumerate.OrderInquiryType;
 import com.xxfc.platform.order.entity.MembersOrder;
@@ -19,15 +15,14 @@ import com.xxfc.platform.order.pojo.HomePageOrderData;
 import com.xxfc.platform.order.pojo.Member;
 import com.xxfc.platform.order.pojo.MembersOrderDto;
 import com.xxfc.platform.order.pojo.OrderQuery;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.assertj.core.util.Lists;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import java.math.BigDecimal;
-import java.text.DateFormat;
 import java.text.ParseException;
-import java.text.SimpleDateFormat;
 import java.util.*;
 import java.util.stream.Collectors;
 
@@ -91,7 +86,7 @@ public class OrderStatisticsBiz extends BaseBiz<OrderStatisticsMapper, OrderStat
         return result;
     }
 
-    public Object getMemberOrderStatistics(List<BaseUserMemberLevel> memberLevels, OrderQuery query) throws ParseException {
+    public List<MembersOrderDto> getMemberOrderStatistics(List<BaseUserMemberLevel> memberLevels, OrderQuery query) throws ParseException {
 
         List<MembersOrder> membersOrderList = membersBiz.getMemberOrderStatistics(query);
 
@@ -136,7 +131,7 @@ public class OrderStatisticsBiz extends BaseBiz<OrderStatisticsMapper, OrderStat
                     //获取今天是今年的第几周
                     time = OrderDateUtils.getTodayOfWeek();
                 }
-               Integer  thisYear =OrderDateUtils.getThisYear();
+                Integer thisYear = OrderDateUtils.getThisYear();
                 if (OrderInquiryType.MONTH.getCode().equals(query.getType())) {
                     startDay = OrderDateUtils.getFirstDayOfMonth(Integer.parseInt(periods[0]), Integer.parseInt(periods[1]));
                     endDay = OrderDateUtils.getLastDayOfMonth(Integer.parseInt(periods[0]), Integer.parseInt(periods[1]));
@@ -148,7 +143,7 @@ public class OrderStatisticsBiz extends BaseBiz<OrderStatisticsMapper, OrderStat
                     startDay = OrderDateUtils.timeStampConversionToString(query.getStartTime());
                 }
                 //获取当前的年.周(年.月)小数
-                double today=Double.parseDouble(thisYear+"."+time);
+                double today = Double.parseDouble(thisYear + "." + time);
 
                 if (i == (membersOrderList.size() - 1)) {
                     //查询到的最后一条数据年.周(年.月)小数
@@ -177,7 +172,7 @@ public class OrderStatisticsBiz extends BaseBiz<OrderStatisticsMapper, OrderStat
 
         //进行分页处理
 
-           return    arrayList;
+        return arrayList;
 
 //        return pagingProcessing(query, arrayList);
 
@@ -193,16 +188,54 @@ public class OrderStatisticsBiz extends BaseBiz<OrderStatisticsMapper, OrderStat
 
     private void TotalPaymentAndMemberName(HashMap<Integer, String> map, MembersOrder mb, MembersOrderDto mbdto) {
 
-        BigDecimal totalPayment =BigDecimal.ZERO;
+        BigDecimal totalPayment = BigDecimal.ZERO;
         List<Member> members = mb.getMembers();
         //设置时间段购买会员总金额和不同的会员名称
         if (CollectionUtil.isNotEmpty(members)) {
             mbdto.setMembers(members);
             for (Member member : members) {
                 member.setMemberName(map.get(member.getLevel()));
-                totalPayment = totalPayment.add(member.getAmount()==null?BigDecimal.ZERO:member.getAmount());
+                totalPayment = totalPayment.add(member.getAmount() == null ? BigDecimal.ZERO : member.getAmount());
             }
         }
         mbdto.setTotalPayment(totalPayment);
     }
+
+    public Object downloadExcel() {
+
+
+        return null;
+    }
+
+    public List<HashMap<Object, Object>> getRows(List<MembersOrderDto> list, List<BaseUserMemberLevel> memberLevels) {
+        ArrayList<HashMap<Object, Object>> rows = Lists.newArrayList();
+        for (MembersOrderDto membersOrderDto : list) {
+            if (CollectionUtils.isEmpty(membersOrderDto.getMembers())) {
+                continue;
+            }
+            HashMap<Object, Object> map = Maps.newLinkedHashMap();
+            map.put("时间", membersOrderDto.getTimeSlot());
+            for (BaseUserMemberLevel memberLevel : memberLevels) {
+                setMap(membersOrderDto, map, memberLevel);
+            }
+            map.put("总支付金额", membersOrderDto.getTotalPayment());
+            rows.add(map);
+        }
+
+
+        return rows;
+    }
+
+    private void setMap(MembersOrderDto membersOrderDto, HashMap<Object, Object> map, BaseUserMemberLevel memberLevel) {
+
+        List<Member> collect = membersOrderDto.getMembers().parallelStream().filter(el -> el.getLevel().equals(memberLevel.getLevel())).collect(Collectors.toList());
+        int number = 0;
+        BigDecimal amount = BigDecimal.ZERO;
+        if (CollectionUtils.isNotEmpty(collect)) {
+            number = collect.get(0).getNumber();
+            amount = collect.get(0).getAmount();
+        }
+        map.put(memberLevel.getName() + "购买量", number);
+        map.put("支付金额(" + memberLevel.getName() + ")",amount);
+    }
 }

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

 package com.xxfc.platform.order.rest.background;
 
+import cn.hutool.core.collection.CollUtil;
+import cn.hutool.core.io.IoUtil;
+import cn.hutool.poi.excel.ExcelUtil;
+import cn.hutool.poi.excel.ExcelWriter;
 import com.github.wxiaoqi.security.admin.entity.BaseUserMemberLevel;
 import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
@@ -9,22 +13,30 @@ import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
 import com.github.wxiaoqi.security.common.util.Query;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
+import com.google.common.collect.Lists;
 import com.xxfc.platform.order.biz.DailyMembersOrderStatisticsBiz;
 import com.xxfc.platform.order.biz.DailyTravelOrderStatisticsBiz;
 import com.xxfc.platform.order.biz.DailyVehicleOrderStatisticsBiz;
 import com.xxfc.platform.order.biz.OrderStatisticsBiz;
 import com.xxfc.platform.order.entity.OrderStatistics;
 import com.xxfc.platform.order.pojo.HomePageOrderData;
+import com.xxfc.platform.order.pojo.MembersOrderDto;
 import com.xxfc.platform.order.pojo.OrderQuery;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
+import org.apache.commons.collections.CollectionUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.ServletOutputStream;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.lang.reflect.Array;
 import java.text.DateFormat;
 import java.text.ParseException;
 import java.util.Date;
+import java.util.HashMap;
 import java.util.List;
 import java.util.stream.Collectors;
 
@@ -40,6 +52,9 @@ public class OrderStatisticsController extends BaseController<OrderStatisticsBiz
 
     @Autowired
     private UserAuthConfig userAuthConfig;
+
+    @Autowired
+    private HttpServletResponse response;
     /**
      * 租车订单
      */
@@ -135,14 +150,41 @@ public class OrderStatisticsController extends BaseController<OrderStatisticsBiz
 
     @PostMapping("/order")
     @ApiOperation(value = "会员统计")
-    public ObjectRestResponse getMemberOrderStatisticsData(@RequestBody OrderQuery query) throws ParseException {
+    public ObjectRestResponse<List<MembersOrderDto>> getMemberOrderStatisticsData(@RequestBody OrderQuery query) throws ParseException {
 
         //获取会员等级信息
         List<BaseUserMemberLevel> memberLevels = userFeign.levels();
         //获取会员订单统计信息
-        return ObjectRestResponse.succ( baseBiz.getMemberOrderStatistics(memberLevels,query));
-
+        return ObjectRestResponse.succ(baseBiz.getMemberOrderStatistics(memberLevels, query));
     }
 
 
+    @PostMapping("/excel")
+    @ApiOperation(value = "下载excel表")
+    public void downloadExcel(@RequestBody OrderQuery query) throws Exception {
+
+        // 通过工具类创建writer，默认创建xls格式
+        ExcelWriter writer = ExcelUtil.getWriter(true);
+        List<BaseUserMemberLevel> memberLevels = userFeign.levels();
+        List<MembersOrderDto> list = baseBiz.getMemberOrderStatistics(memberLevels, query);
+        List<HashMap<Object, Object>> rows =baseBiz.getRows(list,memberLevels);
+
+        // 一次性写出内容，使用默认样式，强制输出标题
+        writer.write(rows, true);
+        //out为OutputStream，需要写出到的目标流
+
+        //response为HttpServletResponse对象
+        response.setContentType("application/vnd.ms-excel;charset=utf-8");
+        //test.xls是弹出下载对话框的文件名，不能为中文，中文请自行编码
+        response.setHeader("Content-Disposition", "attachment;filename=hwddtj.xls");
+        ServletOutputStream out = response.getOutputStream();
+
+        writer.flush(out, true);
+        // 关闭writer，释放内存
+        writer.close();
+        //此处记得关闭输出Servlet流
+        IoUtil.close(out);
+
+
+    }
 }

xx-order/xx-order-server/src/main/resources/mapper/DailyMembersOrderStatisticsMapper.xml

@@ -41,48 +41,52 @@
 
     <select id="getMemberOrderStatistics" parameterType="com.xxfc.platform.order.pojo.OrderQuery"
             resultMap="order">
-    SELECT
-    <if test="type==2">
-        DATE_FORMAT(date( FROM_UNIXTIME( a.crt_time / 1000 ) ),'%Y-%v') AS period,
-    </if>
-    <if test="type==3">
-        DATE_FORMAT(date( FROM_UNIXTIME( a.crt_time / 1000 ) ),'%Y-%m') AS period,
-    </if>
-	date( FROM_UNIXTIME( a.crt_time / 1000 ) ) AS period,
-	count( a.id ) AS number,
-	SUM( a.account_amount ) AS amount,
-	d.member_level AS level
-    FROM
-	order_account a
-	LEFT JOIN base_order b ON a.order_id = b.id
-	LEFT JOIN order_member_detail d ON d.order_id = b.id
-    WHERE
-	a.account_status = 1
-	AND a.account_type = 101
-	AND b.type = 3
-	<if test="startTime != null">
-        AND a.crt_time &gt;= #{startTime}
-    </if>
-    <if test="endTime != null">
-        AND  a.crt_time &lt;= #{endTime}
-    </if>
-    GROUP BY
-    <if test="type==2">
-        DATE_FORMAT(date( FROM_UNIXTIME( a.crt_time / 1000 ) ),'%Y-%v'),
-    </if>
-    <if test="type==3">
-        DATE_FORMAT(date( FROM_UNIXTIME( a.crt_time / 1000 ) ),'%Y-%m'),
-    </if>
+        SELECT
+        <if test="type==2">
+            DATE_FORMAT(date( FROM_UNIXTIME( a.account_time / 1000 ) ),'%Y-%v') AS period,
+        </if>
+        <if test="type==3">
+            DATE_FORMAT(date( FROM_UNIXTIME( a.account_time / 1000 ) ),'%Y-%m') AS period,
+        </if>
+        <if test="type==1">
+            date( FROM_UNIXTIME( a.account_time / 1000 ) ) AS period,
+        </if>
+        count( a.id ) AS number,
+        SUM( a.account_amount ) AS amount,
+        d.member_level AS level
+        FROM
+        order_account a
+        LEFT JOIN base_order b ON a.order_id = b.id
+        LEFT JOIN order_member_detail d ON d.order_id = b.id
+        WHERE
+        a.account_status = 1
+        AND a.account_type = 101
+        AND b.type = 3
+        <if test="startTime != null">
+            AND a.crt_time &gt;= #{startTime}
+        </if>
+        <if test="endTime != null">
+            AND a.crt_time &lt;= #{endTime}
+        </if>
+        GROUP BY
+        <if test="type==2">
+            DATE_FORMAT(date( FROM_UNIXTIME( a.account_time / 1000 ) ),'%Y-%v'),
+        </if>
+        <if test="type==3">
+            DATE_FORMAT(date( FROM_UNIXTIME( a.account_time / 1000 ) ),'%Y-%m'),
+        </if>
 
-	date( FROM_UNIXTIME( a.crt_time / 1000 ) ),
-	d.member_level
+        <if test="type==1">
+            date( FROM_UNIXTIME( a.account_time / 1000 ) ),
+        </if>
+        d.member_level
     </select>
     <resultMap id="order" type="com.xxfc.platform.order.entity.MembersOrder">
-        <result column="period"  property="period"></result>
-         <collection property="members" ofType="com.xxfc.platform.order.pojo.Member">
-             <result column="number"  property="number"></result>
-             <result column="amount"  property="amount"></result>
-             <result column="level"  property="level"></result>
-         </collection>
+        <result column="period" property="period"></result>
+        <collection property="members" ofType="com.xxfc.platform.order.pojo.Member">
+            <result column="number" property="number"></result>
+            <result column="amount" property="amount"></result>
+            <result column="level" property="level"></result>
+        </collection>
     </resultMap>
 </mapper>
\ No newline at end of file

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/biz/SummitActivityBiz.java

@@ -184,7 +184,7 @@ public class SummitActivityBiz extends BaseBiz<SummitActivityMapper, SummitActiv
         criteria.andEqualTo("isShow", 1);
         //位置
         criteria.andIn("location", Arrays.asList(location, 0));
-        criteria.andGreaterThan("endTime", Instant.now().toEpochMilli());
+    //    criteria.andGreaterThan("endTime", Instant.now().toEpochMilli());
 
         List<SummitActivity> summitActivities = mapper.selectByExample(example);
 

xx-uccn/xx-uccn-server/src/main/java/com/xxfc/platform/uccn/rest/SummitActivityController.java

@@ -55,7 +55,7 @@ public class SummitActivityController {
     @GetMapping("/list")
     public ObjectRestResponse<PageDataVO<SummitActivityVo>> findSummitActivityWithPage(@RequestParam(value = "page", defaultValue = "1", required = false) Integer page,
                                                                                       @RequestParam(value = "limit", defaultValue = "6", required = false) Integer limit,
-                                                                                      @RequestParam(value = "location", defaultValue = "0", required = false) Integer location,
+                                                                                      @RequestParam(value = "location", defaultValue = "1", required = false) Integer location,
                                                                                        @RequestParam(value = "title",required = false) String title) {
         PageDataVO<SummitActivityVo> pageDataVO = summitActivityBiz.findSummitActivityWithPage(page, limit,location,title);
         return ObjectRestResponse.succ(pageDataVO);