From a652073ff812a9145afdf57d13dec63434029b54 Mon Sep 17 00:00:00 2001
From: haoxr <1490493387@qq.com>
Date: Sun, 21 Mar 2021 10:11:17 +0800
Subject: [PATCH] =?UTF-8?q?fix:=E7=A7=BB=E9=99=A4=E5=A4=9A=E4=BD=99?=
 =?UTF-8?q?=E6=97=A5=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mall/oms/pojo/domain/OmsOrderItem.java    |  6 +++--
 .../oms/controller/app/OrderController.java   |  9 ++++---
 .../youlai/mall/oms/mapper/OrderMapper.java   |  2 +-
 .../oms/service/impl/OrderServiceImpl.java    | 27 ++++++++++---------
 .../youlai/mall/pms/pojo/domain/PmsSku.java   |  2 +-
 .../com/youlai/mall/ums/pojo/vo/MemberVO.java |  2 ++
 .../src/main/resources/bootstrap-dev.yml      |  1 +
 youlai-common/common-redis/pom.xml            |  2 +-
 .../src/main/resources/logback-spring.xml     | 12 +++++++++
 9 files changed, 41 insertions(+), 22 deletions(-)

diff --git a/mall-oms/oms-api/src/main/java/com/youlai/mall/oms/pojo/domain/OmsOrderItem.java b/mall-oms/oms-api/src/main/java/com/youlai/mall/oms/pojo/domain/OmsOrderItem.java
index 4740e9d3d..e90ebdf57 100644
--- a/mall-oms/oms-api/src/main/java/com/youlai/mall/oms/pojo/domain/OmsOrderItem.java
+++ b/mall-oms/oms-api/src/main/java/com/youlai/mall/oms/pojo/domain/OmsOrderItem.java
@@ -39,6 +39,10 @@ public class OmsOrderItem extends BaseEntity {
      * 商品sku编号
      */
     private String skuCode;
+
+
+    private String skuName;
+
     /**
      * 商品sku名字
      */
@@ -92,6 +96,4 @@ public class OmsOrderItem extends BaseEntity {
      */
     private Integer deleted;
 
-
-
 }
diff --git a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/controller/app/OrderController.java b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/controller/app/OrderController.java
index 20fa155bf..b237abae1 100644
--- a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/controller/app/OrderController.java
+++ b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/controller/app/OrderController.java
@@ -15,6 +15,7 @@ import io.swagger.annotations.*;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.web.bind.annotation.*;
+
 import javax.validation.Valid;
 
 
@@ -36,13 +37,13 @@ public class OrderController {
     @ApiOperation("订单列表")
     @GetMapping
     @ApiImplicitParams({
-            @ApiImplicitParam(name = "page",defaultValue = "1", value = "页码", paramType = "query", dataType = "Long"),
-            @ApiImplicitParam(name = "limit",defaultValue = "10", value = "每页数量", paramType = "query", dataType = "Long"),
+            @ApiImplicitParam(name = "page", defaultValue = "1", value = "页码", paramType = "query", dataType = "Long"),
+            @ApiImplicitParam(name = "limit", defaultValue = "10", value = "每页数量", paramType = "query", dataType = "Long"),
             @ApiImplicitParam(name = "status", value = "订单状态", paramType = "query", dataType = "Integer")
     })
     public Result list(
-            Long page,
-             Long limit,
+            @RequestParam(defaultValue = "1") Long page,
+            @RequestParam(defaultValue = "10") Long limit,
             Integer status
     ) {
         IPage<OmsOrder> result = orderService.list(new Page<>(page, limit), new OmsOrder().setStatus(status));
diff --git a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/mapper/OrderMapper.java b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/mapper/OrderMapper.java
index 9cec836af..77b210e54 100644
--- a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/mapper/OrderMapper.java
+++ b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/mapper/OrderMapper.java
@@ -18,7 +18,7 @@ public interface OrderMapper extends BaseMapper<OmsOrder> {
 
 
     @Select("<script>" +
-            " select id,order_sn,total_amount,pay_amount,status from oms_order" +
+            " select id,order_sn,total_amount,pay_amount,status,total_amount,total_quantity,gmt_create from oms_order" +
             " where 1=1 " +
             " <if test ='order.status !=null ' >" +
             "   AND status= #{order.status} " +
diff --git a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/service/impl/OrderServiceImpl.java b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/service/impl/OrderServiceImpl.java
index 4be2c1bc2..2000a11f3 100644
--- a/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/service/impl/OrderServiceImpl.java
+++ b/mall-oms/oms-boot/src/main/java/com/youlai/mall/oms/service/impl/OrderServiceImpl.java
@@ -39,10 +39,7 @@ import org.springframework.data.redis.core.script.DefaultRedisScript;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
+import java.util.*;
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ThreadPoolExecutor;
 import java.util.stream.Collectors;
@@ -67,7 +64,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OmsOrder> impleme
      */
     @Override
     public OrderConfirmVO confirm(OrderConfirmDTO orderConfirmDTO) {
-        log.info("=======================订单确认=======================\n订单确认信息：{}",orderConfirmDTO);
+        log.info("=======================订单确认=======================\n订单确认信息：{}", orderConfirmDTO);
         OrderConfirmVO orderConfirmVO = new OrderConfirmVO();
         Long memberId = RequestUtils.getUserId();
         // 获取购买商品信息
@@ -125,7 +122,7 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OmsOrder> impleme
     @Override
     @GlobalTransactional
     public OrderSubmitVO submit(OrderSubmitDTO submitDTO) {
-        log.info("=======================订单提交=======================\n订单提交信息：{}",submitDTO);
+        log.info("=======================订单提交=======================\n订单提交信息：{}", submitDTO);
         // 订单重复提交校验
         String orderToken = submitDTO.getOrderToken();
         DefaultRedisScript<Long> redisScript = new DefaultRedisScript<>(RELEASE_LOCK_LUA_SCRIPT, Long.class);
@@ -174,13 +171,18 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OmsOrder> impleme
                 .setSourceType(OrderTypeEnum.APP.getCode())
                 .setMemberId(RequestUtils.getUserId())
                 .setRemark(submitDTO.getRemark())
-                .setPayAmount(submitDTO.getPayAmount());
+                .setPayAmount(submitDTO.getPayAmount())
+                .setTotalQuantity(orderItems.stream().map(item -> item.getCount()).reduce(0, (x, y) -> x + y))
+                .setTotalAmount(orderItems.stream().map(item -> item.getPrice() * item.getCount()).reduce(0l, (x, y) -> x + y))
+                .setGmtCreate(new Date());
+        ;
         this.save(order);
 
         // 创建订单商品
         List<OmsOrderItem> orderItemList = orderItems.stream().map(item -> OmsOrderItem.builder()
                 .orderId(order.getId())
                 .skuId(item.getSkuId())
+                .skuName(item.getTitle())
                 .skuPrice(item.getPrice())
                 .skuPic(item.getPic())
                 .skuQuantity(item.getCount())
@@ -215,18 +217,18 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OmsOrder> impleme
         log.info("=======================订单取消，订单ID：{}=======================", id);
         OmsOrder order = this.getById(id);
 
-        if ( order != null &&!OrderStatusEnum.PENDING_PAYMENT.getCode().equals(order.getStatus()) ) {
+        if (order != null && !OrderStatusEnum.PENDING_PAYMENT.getCode().equals(order.getStatus())) {
             throw new BizException("取消失败，订单状态不支持取消"); // 通过自定义异常，将异常信息抛出由异常处理器捕获显示给前端页面
         }
         order.setStatus(OrderStatusEnum.USER_CANCEL.getCode());
         boolean result = this.updateById(order);
-        if(result){
+        if (result) {
             // 释放被锁定的库存
             Result unlockResult = skuFeignService.unlockStock(order.getOrderSn());
-            if(!Result.isSuccess(unlockResult)){
-              throw new BizException(unlockResult.getMsg());
+            if (!Result.isSuccess(unlockResult)) {
+                throw new BizException(unlockResult.getMsg());
             }
-            result=true;
+            result = true;
         }
         return result;
     }
@@ -247,7 +249,6 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, OmsOrder> impleme
     }
 
 
-
     @Override
     public IPage<OmsOrder> list(Page<OmsOrder> page, OmsOrder order) {
         List<OmsOrder> list = this.baseMapper.list(page, order);
diff --git a/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/domain/PmsSku.java b/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/domain/PmsSku.java
index 6a37819a0..133c26e43 100644
--- a/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/domain/PmsSku.java
+++ b/mall-pms/pms-api/src/main/java/com/youlai/mall/pms/pojo/domain/PmsSku.java
@@ -11,7 +11,7 @@ public class PmsSku extends BaseEntity {
     @TableId(type = IdType.AUTO)
     private Long id;
     private Long spuId;
-    private String title;
+    private String name;
     private String code;
     private String pic;
     private Long originPrice;
diff --git a/mall-ums/ums-api/src/main/java/com/youlai/mall/ums/pojo/vo/MemberVO.java b/mall-ums/ums-api/src/main/java/com/youlai/mall/ums/pojo/vo/MemberVO.java
index c7a6be432..ae508cd63 100644
--- a/mall-ums/ums-api/src/main/java/com/youlai/mall/ums/pojo/vo/MemberVO.java
+++ b/mall-ums/ums-api/src/main/java/com/youlai/mall/ums/pojo/vo/MemberVO.java
@@ -10,5 +10,7 @@ public class MemberVO {
 
     private String avatar;
 
+    private Long balance;
+
 
 }
diff --git a/youlai-admin/admin-boot/src/main/resources/bootstrap-dev.yml b/youlai-admin/admin-boot/src/main/resources/bootstrap-dev.yml
index 153c5eb17..f6839b82e 100644
--- a/youlai-admin/admin-boot/src/main/resources/bootstrap-dev.yml
+++ b/youlai-admin/admin-boot/src/main/resources/bootstrap-dev.yml
@@ -11,3 +11,4 @@ spring:
       config:
         server-addr: ${spring.cloud.nacos.discovery.server-addr}
         file-extension: yaml
+
diff --git a/youlai-common/common-redis/pom.xml b/youlai-common/common-redis/pom.xml
index 5b80de48b..9f6c8ce52 100644
--- a/youlai-common/common-redis/pom.xml
+++ b/youlai-common/common-redis/pom.xml
@@ -22,7 +22,7 @@
             <artifactId>spring-boot-starter-data-redis</artifactId>
         </dependency>
 
-        <dependency>
+       <dependency>
             <groupId>org.apache.commons</groupId>
             <artifactId>commons-pool2</artifactId>
         </dependency>
diff --git a/youlai-common/common-web/src/main/resources/logback-spring.xml b/youlai-common/common-web/src/main/resources/logback-spring.xml
index 410c9c689..da82da320 100644
--- a/youlai-common/common-web/src/main/resources/logback-spring.xml
+++ b/youlai-common/common-web/src/main/resources/logback-spring.xml
@@ -59,6 +59,18 @@
         <appender-ref ref="LOGIN_LOGSTASH"/>
     </logger>
 
+    <logger name="com.alibaba.nacos" level="ERROR" additivity="true">
+        <appender-ref ref="CONSOLE"/>
+    </logger>
+
+    <logger name="org.springframework.data.redis" level="ERROR" additivity="true">
+        <appender-ref ref="CONSOLE"/>
+    </logger>
+
+    <logger name="io.lettuce" level="ERROR" additivity="true">
+        <appender-ref ref="CONSOLE"/>
+    </logger>
+
     <!-- 根logger -->
     <root>
         <level>INFO</level>