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

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;
     }