Merge branch 'base-modify' of http://10.5.52.3/youjj/cloud-platform into base-modify

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

@@ -98,8 +98,12 @@ public class UserBusinessBiz {
         if (leaderId != 0) {
             Map<Integer, AppUserLogin> userIdAndUserLoginMap = appUserLoginBiz.findUserIdAndUserLoginMapByMemberIds(Arrays.asList(leaderId));
             Map<Integer, AppUserDetail> userIdAndUserDetailMap = appUserDetailBiz.findUserIdAndUserDetailMapByMemberIds(Arrays.asList(leaderId));
-            promoteBO.setLeaderUsername(userIdAndUserLoginMap.get(leaderId).getUsername());
-            promoteBO.setLeaderHeadUrl(userIdAndUserDetailMap.get(leaderId).getHeadimgurl());
+            if (!userIdAndUserLoginMap.isEmpty()){
+                promoteBO.setLeaderUsername(userIdAndUserLoginMap.get(leaderId).getUsername());
+            }
+            if (!userIdAndUserDetailMap.isEmpty()){
+                promoteBO.setLeaderHeadUrl(userIdAndUserDetailMap.get(leaderId).getHeadimgurl());
+            }
         }
         promoteBO.setInviteNumber(memberStateAndCountMap.get(0));
         promoteBO.setActivatedNumber(memberStateAndCountMap.get(1));

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/handler/WaterMQHandler.java

@@ -8,7 +8,9 @@ import com.github.wxiaoqi.security.admin.biz.AppUserSellingWaterBiz;
 import com.github.wxiaoqi.security.admin.dto.OrderGoodsDTO;
 import com.github.wxiaoqi.security.admin.dto.OrderWaterDTO;
 import com.rabbitmq.client.Channel;
+import com.xxfc.platform.order.contant.enumerate.ItemTypeEnum;
 import com.xxfc.platform.order.contant.enumerate.OrderTypeEnum;
+import com.xxfc.platform.order.entity.OrderItem;
 import com.xxfc.platform.order.pojo.mq.OrderMQDTO;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.amqp.core.Message;
@@ -18,6 +20,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.messaging.handler.annotation.Headers;
 import org.springframework.stereotype.Component;
 import java.io.IOException;
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Map;
 import java.util.concurrent.ExecutorService;
@@ -73,7 +76,7 @@ public class WaterMQHandler {
                                             setGoodId(orderMQDTO.getOrderRentVehicleDetail().getModelId());
                                             setGoodNumber(1);
                                             setImg(orderMQDTO.getPicture());
-                                            setPrice(orderMQDTO.getGoodsAmount());
+                                            setPrice(orderMQDTO.getItemByTypeEnum(ItemTypeEnum.VEHICLE_MODEL).getRealAmount());
                                             setTitle(orderMQDTO.getName());
                                             setType(OrderGoodsDTO.TYPE_RENT);
                                         }});
@@ -81,13 +84,16 @@ public class WaterMQHandler {
                             );
                             break;
                         case TOUR:
+                            OrderItem tourAdultItem = orderMQDTO.getItemByTypeEnum(ItemTypeEnum.TOUR_ADULT);
+                            OrderItem tourChildItem = orderMQDTO.getItemByTypeEnum(ItemTypeEnum.TOUR_CHILD);
                             orderWaterDTO.setGoodsDTOList(
                                     new ArrayList<OrderGoodsDTO>() {{
                                         add(new OrderGoodsDTO() {{
                                             setGoodId(orderMQDTO.getOrderTourDetail().getGoodId());
                                             setGoodNumber(1);
                                             setImg(orderMQDTO.getPicture());
-                                            setPrice(orderMQDTO.getGoodsAmount());
+                                            setPrice(tourAdultItem.getRealAmount().add(null == tourChildItem?
+                                                    BigDecimal.ZERO:tourChildItem.getRealAmount()));
                                             setTitle(orderMQDTO.getName());
                                             setType(OrderGoodsDTO.TYPE_TOUR);
                                         }});
@@ -101,7 +107,7 @@ public class WaterMQHandler {
                                             setGoodId(orderMQDTO.getOrderMemberDetail().getMemberLevelId());
                                             setGoodNumber(1);
                                             setImg(orderMQDTO.getPicture());
-                                            setPrice(orderMQDTO.getGoodsAmount());
+                                            setPrice(orderMQDTO.getItemByTypeEnum(ItemTypeEnum.MEMBER).getRealAmount());
                                             setTitle(orderMQDTO.getName());
                                             setType(OrderGoodsDTO.TYPE_MEMBER);
                                         }});

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/UserCouponBiz.java

@@ -202,6 +202,9 @@ public class UserCouponBiz extends BaseBiz<UserCouponMapper, UserCoupon> {
             }
             couponAmout=couponAmout.add(getCouponAmout(couponId,channel,amout));
         }
+        if (couponAmout.compareTo(amout)>0){
+            couponAmout=amout;
+        }
         return couponAmout;
     }
 
@@ -266,9 +269,9 @@ public class UserCouponBiz extends BaseBiz<UserCouponMapper, UserCoupon> {
         if (CollectionUtils.isEmpty(data)) {
             return userCouponPag;
         }
-        Map<Integer, AppUserLogin> userIdAndAppuserLoginMap = null;
-        if (Objects.nonNull(userCouponFindDTO.getPhone())) {
-            List<Integer> userIds = data.stream().map(UserCouponDTO::getUserId).collect(Collectors.toList());
+        Map<Integer, AppUserLogin> userIdAndAppuserLoginMap = new HashMap<>();
+        if (StringUtils.isEmpty(userCouponFindDTO.getPhone())) {
+            List<Integer> userIds = data.stream().map(UserCouponDTO::getUserId).distinct().collect(Collectors.toList());
             userIdAndAppuserLoginMap = userFeign.findAppUsersByUserIds(userIds);
         }
         List<UserCouponPageVo> userCouponPageVos = new ArrayList<>();
@@ -279,7 +282,7 @@ public class UserCouponBiz extends BaseBiz<UserCouponMapper, UserCoupon> {
             if (Objects.nonNull(userCouponFindDTO.getPhone())) {
                 userCouponPageVo.setPhone(userCouponFindDTO.getPhone());
             } else {
-                userCouponPageVo.setPhone(userIdAndAppuserLoginMap == null ? "" : userIdAndAppuserLoginMap.get(userCouponDTO.getUserId()) == null ? "" : userIdAndAppuserLoginMap.get(userCouponDTO.getUserId()).getUsername());
+                userCouponPageVo.setPhone(userIdAndAppuserLoginMap.get(userCouponDTO.getUserId()) == null ? "" : userIdAndAppuserLoginMap.get(userCouponDTO.getUserId()).getUsername());
             }
             userCouponPageVos.add(userCouponPageVo);
         }
@@ -344,4 +347,11 @@ public class UserCouponBiz extends BaseBiz<UserCouponMapper, UserCoupon> {
         userInfoDTO.setCouponNumber(couponNumber);
         return  userInfoDTO;
     }
+
+    public void deleteByUserIds(List<Integer> userIds) {
+        Example example = new Example(UserCoupon.class);
+        Example.Criteria criteria = example.createCriteria();
+        criteria.andIn("userId",userIds);
+        mapper.deleteByExample(example);
+    }
 }
\ No newline at end of file

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

@@ -2,6 +2,7 @@ package com.xxfc.platform.activity.rest;
 
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.xxfc.platform.activity.biz.ActivityPopularizeUserBiz;
+import com.xxfc.platform.activity.biz.UserCouponBiz;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -20,12 +21,16 @@ import java.util.List;
 @RequestMapping("/activity_data")
 public class DateController {
 
-       @Autowired
+        @Autowired
         private ActivityPopularizeUserBiz activityPopularizeUserBiz;
 
+        private UserCouponBiz  userCouponBiz;
+
+
       @GetMapping("/clear")
       public ObjectRestResponse<Void> clearDate(@RequestParam(value = "userIds") List<Integer>  userIds){
           activityPopularizeUserBiz.deleteByUserIds(userIds);
+          userCouponBiz.deleteByUserIds(userIds);
           return ObjectRestResponse.succ();
       }
 }

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/price/OrderPriceVO.java

@@ -13,4 +13,6 @@ public class OrderPriceVO {
     public BigDecimal goodsAmount;
     @ApiModelProperty(value = "实际价格")
     public BigDecimal realAmount;
+    @ApiModelProperty(value = "优惠券扣除的费用")
+    public BigDecimal couponAmount;
 }

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/price/RentVehiclePriceVO.java

@@ -33,6 +33,4 @@ public class RentVehiclePriceVO extends OrderPriceVO{
     BigDecimal damageSafePrice;
     @ApiModelProperty(value = "费用详情")
     private String costDetail;
-    @ApiModelProperty(value = "优惠券扣除的费用")
-    private BigDecimal couponAmount;
 }

xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/price/TourPriceVO.java

@@ -53,8 +53,4 @@ public class TourPriceVO extends OrderPriceVO{
     //总人数
     @ApiModelProperty(value = "总人数")
     private Integer totalNumber;
-
-    //优惠券
-    @ApiModelProperty(value = "优惠券扣除的费用")
-    private BigDecimal couponAmount;
 }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/OrderMemberService.java

@@ -29,6 +29,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.PostConstruct;
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.stream.Collectors;
@@ -140,10 +141,13 @@ public class OrderMemberService extends AbstractOrderHandle<OrderMemberDetailBiz
         BigDecimal couponAmount = BigDecimal.ZERO;
 
         //设置Item
-        OrderItem vehicleOrderItem = orderItemBiz.initOrderItem(detail.getBaseUserMemberLevel().getPrice(), 1, detail.getBaseUserMemberLevel().getName(), detail.getBaseUserMemberLevel().getId(), ItemTypeEnum.MEMBER);
+        OrderItem memberOrderItem = orderItemBiz.initOrderItem(detail.getBaseUserMemberLevel().getPrice(), 1, detail.getBaseUserMemberLevel().getName(), detail.getBaseUserMemberLevel().getId(), ItemTypeEnum.MEMBER);
+
+        detail.setItems(new ArrayList<OrderItem>());
+        detail.getItems().add(memberOrderItem);
 
         //商品价格
-        goodsAmount = goodsAmount.add(vehicleOrderItem.getCalculateAmount(Boolean.TRUE));
+        goodsAmount = goodsAmount.add(memberOrderItem.getCalculateAmount(Boolean.TRUE));
 
         //vehicleAmount 优惠券处理
         if(null != detail.getTickerNo() && detail.getTickerNo().size() > 0) {
@@ -151,7 +155,7 @@ public class OrderMemberService extends AbstractOrderHandle<OrderMemberDetailBiz
             if(couponAmount.compareTo(BigDecimal.ZERO) > 0) {
                 detail.getOrder().setCouponTickerNos(detail.getTickerNo().stream().collect(Collectors.joining(",")));
                 detail.getOrder().setHasDiscount(SYS_TRUE);
-                vehicleOrderItem.handleCouponAmount(couponAmount);
+                memberOrderItem.handleCouponAmount(couponAmount);
             }
         }
 
@@ -165,6 +169,7 @@ public class OrderMemberService extends AbstractOrderHandle<OrderMemberDetailBiz
         opv.setOrderAmount(orderAmount);
         opv.setGoodsAmount(goodsAmount);
         opv.setRealAmount(realAmount);
+        opv.setCouponAmount(couponAmount);
 
         return opv;
     }

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/service/OrderTourService.java

@@ -143,7 +143,7 @@ public class OrderTourService extends AbstractOrderHandle<OrderTourDetailBiz, To
 
         OrderItem tourAdultItem = bo.getItemByTypeEnum(ItemTypeEnum.TOUR_ADULT);
         OrderItem tourChildItem = bo.getItemByTypeEnum(ItemTypeEnum.TOUR_CHILD);
-        BigDecimal amount = tourAdultItem.getTotalAmount().add(tourChildItem.getTotalAmount());
+        BigDecimal amount = tourAdultItem.getTotalAmount().add(null == tourChildItem? BigDecimal.ZERO: tourChildItem.getTotalAmount());
 
         //如果有使用优惠券，则扣减
         if(BigDecimal.ZERO.compareTo(bo.getOrder().getCouponAmount()) < 0) {
@@ -215,14 +215,22 @@ public class OrderTourService extends AbstractOrderHandle<OrderTourDetailBiz, To
         tourAdultItem.setUnitPrice(tourSpePriceVo.getPrice());
         OrderItem tourChildItem = orderItemBiz.initOrderItem(tourSpePriceVo.getChildOriginalPrice(), detail.getChildNum(), "儿童", detail.getSpePriceId(), ItemTypeEnum.TOUR_CHILD);
         tourChildItem.setUnitPrice(tourSpePriceVo.getChildPrice());
+
         //人数 * 天数
         OrderItem insureItem = orderItemBiz.initOrderItem(INSURE_PRICE, detail.getTotalNumber() * detail.getTourGood().getNumber(), "旅游保险", null, ItemTypeEnum.TOUR_INSURE);
 
+        detail.setItems(new ArrayList<OrderItem>());
+        detail.getItems().add(tourAdultItem);
+        if(tourChildItem.getBuyNum() > 0) {
+            detail.getItems().add(tourChildItem);
+        }
+
 
         //需要保险
         if(SYS_TRUE.equals(detail.getHasInsure())) {
             //人数 * 天数 * 价格
             insureAmount = insureAmount.add(insureItem.getCalculateAmount(Boolean.TRUE));
+            detail.getItems().add(insureItem);
         }
 
             //总价

xx-universal/xx-universal-server/src/main/resources/logback.xml

@@ -2,21 +2,21 @@
 <configuration debug="false">
 	<!--定义日志文件的存储地址 勿在 LogBack 的配置中使用相对路径 -->
 	<property name="LOG_HOME" value="${system.log.path:-logs}"/>
-	
-    <!-- 彩色日志依赖的渲染类 -->
-    <conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter" />
-    <conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter" />
-    <conversionRule conversionWord="wEx" converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter" />
-    <!-- 彩色日志格式 -->
-    <property name="CONSOLE_LOG_PATTERN" value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
-
-    <appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> <!--1. 输出到控制台-->
-        <encoder>
-            <Pattern>${CONSOLE_LOG_PATTERN}</Pattern>
-            <charset>UTF-8</charset> <!-- 设置字符集 -->
-        </encoder>
-    </appender>
-	
+
+	<!-- 彩色日志依赖的渲染类 -->
+	<conversionRule conversionWord="clr" converterClass="org.springframework.boot.logging.logback.ColorConverter" />
+	<conversionRule conversionWord="wex" converterClass="org.springframework.boot.logging.logback.WhitespaceThrowableProxyConverter" />
+	<conversionRule conversionWord="wEx" converterClass="org.springframework.boot.logging.logback.ExtendedWhitespaceThrowableProxyConverter" />
+	<!-- 彩色日志格式 -->
+	<property name="CONSOLE_LOG_PATTERN" value="${CONSOLE_LOG_PATTERN:-%clr(%d{yyyy-MM-dd HH:mm:ss}){faint} %clr(${LOG_LEVEL_PATTERN:-%5p}) %clr(${PID:- }){magenta} %clr(---){faint} %clr([%15.15t]){faint} %clr(%-40.40logger{39}){cyan} %clr(:){faint} %m%n${LOG_EXCEPTION_CONVERSION_WORD:-%wEx}}"/>
+
+	<appender name="STDOUT" class="ch.qos.logback.core.ConsoleAppender"> <!--1. 输出到控制台-->
+		<encoder>
+			<Pattern>${CONSOLE_LOG_PATTERN}</Pattern>
+			<charset>UTF-8</charset> <!-- 设置字符集 -->
+		</encoder>
+	</appender>
+
 	<appender name="SYSTEM_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"><!-- 按照每天生成日志文件 -->
 		<filter class="com.xxfc.platform.universal.filter.DenyFilter"></filter>
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
@@ -27,7 +27,7 @@
 			<pattern>%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{50} - %msg%n</pattern><!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 -->
 		</encoder>
 	</appender>
-	
+
 	<appender name="WEB_FILE" class="ch.qos.logback.core.rolling.RollingFileAppender"><!-- 按照每天生成日志文件 -->
 		<filter class="com.xxfc.platform.universal.filter.AcceptFilter"></filter>
 		<rollingPolicy class="ch.qos.logback.core.rolling.TimeBasedRollingPolicy">
@@ -38,18 +38,18 @@
 			<pattern>%d{yyyy-MM-dd HH:mm:ss} [%thread] %-5level %logger{50} - %msg%n</pattern><!--格式化输出：%d表示日期，%thread表示线程名，%-5level：级别从左显示5个字符宽度%msg：日志消息，%n是换行符 -->
 		</encoder>
 	</appender>
-	
+
 	<appender name="LOGSTASH" class="net.logstash.logback.appender.LogstashTcpSocketAppender">
-       <destination>192.168.0.181:5044</destination>
-       
-       <encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder" >
-            <!--"appname":"springboot21-log-elk" 的作用是指定创建索引的名字时用，并且在生成的文档中会多了这个字段
-             	在logstashindex中引入    index => "%{[appname]}-%{+YYYY.MM.dd}"-->
-             
-           <customFields>{"appName":"elk-log-service-operate-dev"}</customFields>
-       </encoder>
+		<destination>192.168.0.181:5044</destination>
+
+		<encoder charset="UTF-8" class="net.logstash.logback.encoder.LogstashEncoder" >
+			<!--"appname":"springboot21-log-elk" 的作用是指定创建索引的名字时用，并且在生成的文档中会多了这个字段
+                 在logstashindex中引入    index => "%{[appname]}-%{+YYYY.MM.dd}"-->
+
+			<customFields>{"appName":"elk-log-service-operate-dev"}</customFields>
+		</encoder>
 	</appender>
-    
+
 	<root level="INFO">
 		<appender-ref ref="STDOUT" />
 	</root>