add deliver

yami-shop-api/src/main/java/com/yami/shop/api/controller/AddrController.java

@@ -27,6 +27,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.AllArgsConstructor;
 import ma.glasnost.orika.MapperFacade;
 import org.apache.commons.lang3.ObjectUtils;
+import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
@@ -79,7 +80,8 @@ public class AddrController {
             return ResponseEntity.badRequest().body("该地址已存在");
         }
         int addrCount = userAddrService.count(new LambdaQueryWrapper<UserAddr>().eq(UserAddr::getUserId, userId));
-        UserAddr userAddr = mapperFacade.map(addrParam, UserAddr.class);
+        UserAddr userAddr = new UserAddr();
+        BeanUtils.copyProperties(addrParam, userAddr);
 
         if (addrCount >= MAX_USER_ADDR) {
             throw new GlobalException("收货地址已达到上限，无法再新增地址");

yami-shop-bean/src/main/java/com/yami/shop/bean/model/Order.java

@@ -274,6 +274,8 @@ public class Order implements Serializable {
     @TableField
     private Long offsetPoints;
 
+    @TableField(exist = false)
+    private Integer goodsTotalCount;
 
 
 

yami-shop-platform/src/main/java/com/yami/shop/platform/controller/OrderController.java

@@ -143,7 +143,8 @@ public class OrderController {
 
         List<OrderItem> orderItems = orderItemService.getOrderItemsByOrderNumber(deliveryOrderParam.getOrderNumber());
         if (!orderItems.isEmpty()) {
-            orderItems.forEach(orderItem-> CullenUtils.validateDataThrowException(orderItemService.refundIngCount(orderItem.getOrderItemId())!=0,"该订单存在售后中商品，请处理后发货..."));
+            orderItems.forEach(orderItem->
+                    CullenUtils.validateDataThrowException(orderItemService.refundIngCount(orderItem.getOrderItemId())!=0,"该订单存在售后中商品，请处理后发货..."));
         }
 
         Order orderParam = new Order();

yami-shop-service/src/main/java/com/yami/shop/service/impl/OrderServiceImpl.java

@@ -342,7 +342,11 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
     public IPage<Order> deliverList(PageParam<Order> page, BackendOrderParam orderParam) {
         List<Order> orderList = orderMapper.deliverList(new PageAdapter(page), orderParam);
         if (!orderList.isEmpty()){
-            orderList.forEach(c-> c.setOrderItems(orderItemMapper.getListByOrderNumber(c.getOrderNumber())));
+            orderList.forEach(c-> {
+                List<OrderItem> orderItems = orderItemMapper.getListByOrderNumber(c.getOrderNumber());
+                c.setOrderItems(orderItems);
+                c.setGoodsTotalCount(orderItems.stream().map(OrderItem::getProdCount).reduce(0, Integer::sum));
+            });
         }
         page.setRecords(orderList);
         page.setTotal(orderList.size());

yami-shop-service/src/main/resources/mapper/OrderMapper.xml

@@ -30,6 +30,7 @@
         <result column="close_type" jdbcType="INTEGER" property="closeType"/>
         <result column="user_mobile" jdbcType="VARCHAR" property="userMobile"/>
         <result column="receiver" jdbcType="VARCHAR" property="receiver"/>
+        <result column="shop_name" jdbcType="VARCHAR" property="shopName"/>
     </resultMap>
 
     <resultMap id="MyOrderMap" type="com.yami.shop.bean.app.dto.MyOrderDto">
@@ -458,8 +459,9 @@
     </select>
 
     <select id="deliverList" resultMap="BaseResultMap">
-        SELECT a.*,b.receiver,b.mobile user_mobile FROM tz_order a
+        SELECT a.*,b.receiver,b.mobile user_mobile,c.shop_name FROM tz_order a
         LEFT JOIN tz_user_addr_order b on a.addr_order_id=b.addr_order_id
+        LEFT JOIN tz_shop_detail c on a.shop_id=c.shop_id
         <where>
             a.dvy_type=3
             <if test="orderParam.orderNumber != null and orderParam.orderNumber != ''">