From 41189702c2bbae889e997ae4c1e1d55eee59eadf Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 22 Dec 2022 11:19:43 +0800
Subject: [PATCH] 20221221

---
 src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java       |   24 ++++++++++++------------
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java |    2 +-
 src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java    |    2 +-
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java
index 04d6ccc..6716fb0 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AdminMallOrderService.java
@@ -66,18 +66,18 @@
     public IPage<AdminMallOrderInfoVo> getOrderListInPage(MallOrderInfoDto mallOrderInfo, QueryRequest request) {
         Page<AdminMallOrderInfoVo> page = new Page<>(request.getPageNum(), request.getPageSize());
         IPage<AdminMallOrderInfoVo> adminMallOrderInfoVos = this.baseMapper.selectOrderListInPage(page, mallOrderInfo);
-//        List<AdminMallOrderInfoVo> records = adminMallOrderInfoVos.getRecords();
-//        if(CollUtil.isNotEmpty(records)){
-//            for(AdminMallOrderInfoVo adminMallOrderInfoVo : records){
-//                Long id = adminMallOrderInfoVo.getId();
-//                List<MallOrderItem> mallOrderItemList = mallOrderItemMapper.selectbyOrderId(id);
-//                StringBuffer stringBuffer = new StringBuffer();
-//                for(MallOrderItem mallOrderItem : mallOrderItemList){
-//                    stringBuffer.append(mallOrderItem.getGoodsName()+"*"+mallOrderItem.getCnt()+";");
-//                }
-//                adminMallOrderInfoVo.setGoodsName(stringBuffer.toString());
-//            }
-//        }
+        List<AdminMallOrderInfoVo> records = adminMallOrderInfoVos.getRecords();
+        if(CollUtil.isNotEmpty(records)){
+            for(AdminMallOrderInfoVo adminMallOrderInfoVo : records){
+                Long id = adminMallOrderInfoVo.getId();
+                List<MallOrderItem> mallOrderItemList = mallOrderItemMapper.selectbyOrderId(id);
+                StringBuffer stringBuffer = new StringBuffer();
+                for(MallOrderItem mallOrderItem : mallOrderItemList){
+                    stringBuffer.append(mallOrderItem.getGoodsName()+"*"+mallOrderItem.getCnt()+";");
+                }
+                adminMallOrderInfoVo.setGoodsName(stringBuffer.toString());
+            }
+        }
         return adminMallOrderInfoVos;
     }
 
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
index 6213887..fda28df 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallMemberServiceImpl.java
@@ -73,7 +73,7 @@
     public FebsResponse register(RegisterDto registerDto) {
         MallMember mallMember = this.baseMapper.selectInfoByAccount(registerDto.getAccount());
         if (mallMember != null) {
-            throw new FebsException("该账号已被占用");
+            throw new FebsException("001-该账号已被占用");
         }
 
         List<MallMember> mallMembers = this.baseMapper.selectMemberByName(registerDto.getName());
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
index 7574237..611da7c 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/ApiMallOrderInfoServiceImpl.java
@@ -158,7 +158,7 @@
                 sku.setSkuVolume(sku.getSkuVolume() + 1);
                 mallGoodsSkuMapper.updateById(sku);
 
-                if (addOrderDto.getType() == 1) {
+                if (1 == addOrderDto.getType() ) {
                     mallShoppingCartMapper.delBySkuId(sku.getId(), member.getId());
                 }
                 mallOrderItemMapper.insert(orderItem);

--
Gitblit v1.9.1