[fix]修改订单增加business层代码

ruoyi-admin/src/main/java/org/dromara/app/customer/AppOrderController.java

@@ -3,6 +3,7 @@ package org.dromara.app.customer;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.wzj.soopin.content.utils.RedisOperator;
+import com.wzj.soopin.order.business.IOrderBusiness;
 import com.wzj.soopin.order.domain.bo.OrderBo;
 import com.wzj.soopin.order.domain.bo.SaveOrderBO;
 import com.wzj.soopin.order.domain.entity.Order;
@@ -10,6 +11,7 @@ import com.wzj.soopin.order.domain.vo.ManagerOrderDetailVO;
 import com.wzj.soopin.order.domain.vo.OrderVO;
 import com.wzj.soopin.order.service.IMemberOrderService;
 import com.wzj.soopin.order.service.OrderService;
+import com.wzj.soopin.order.service.VerificationCodeService;
 import io.swagger.annotations.Api;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import lombok.RequiredArgsConstructor;
@@ -32,6 +34,9 @@ public class AppOrderController {
     private final OrderService orderService;
 
     private final IMemberOrderService memberOrderService;
+    private final VerificationCodeService verificationCodeService;
+
+    private final IOrderBusiness orderBusiness;
 
     public RedisOperator redis;
     @Tag(name ="查询订单列表")
@@ -49,8 +54,8 @@ public class AppOrderController {
      * @return
      */
     @GetMapping(value = "/{id}")
-    public R<ManagerOrderDetailVO> getInfo(@PathVariable("id") Long id) {
+    public R<OrderVO> getInfo(@PathVariable("id") Long id) {
-        return R.ok(orderService.selectById(id));
+        return R.ok(orderBusiness.info(id));
     }
 
     /**
@@ -76,4 +81,15 @@ public class AppOrderController {
         return R.ok();
     }
 
+
+
+    /**
+     * 生成核销码
+     */
+    @GetMapping("/generate/{orderId}")
+    @Tag(name = "生成核销码")
+    public R generateCode(@PathVariable Long orderId) {
+        return verificationCodeService.generateVerificationCode(orderId);
+    }
+
 }

ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/core/BusinessImpl.java

@@ -35,7 +35,7 @@ public class BusinessImpl<S extends IService<T>, C extends BaseConverter<V,B,T>,
     }
 
     @Override
-    public V get(Serializable id) {
+    public V info(Serializable id) {
         T t= service.getById(id);
         return converter.toVO(t);
     }

ruoyi-common/ruoyi-common-web/src/main/java/org/dromara/common/web/core/IBusiness.java

@@ -18,7 +18,7 @@ public interface IBusiness<V,B>{
      */
     boolean save(B t);
 
-    V  get(Serializable id);
+    V  info(Serializable id);
 
     List<V>  list(B d);
 

ruoyi-modules/ruoyi-content/src/main/resources/mapper/content/VlogMapperCustom.xml

@@ -192,8 +192,9 @@
                 LEFT JOIN ums_fans f ON v.member_id = f.vlogger_id
                 LEFT JOIN ums_member m ON v.member_id = m.id
         WHERE
-          v.is_private = 0
+            NOT EXISTS ( SELECT 1 FROM cms_vlog_member vm WHERE v.id = vm.vlog_id AND vm.member_id = #{paramMap.myId} )
-          AND v.status = 1
+          AND v.is_private = 0
+          AND v.STATUS = 1
           AND v.first_frame_img IS NOT NULL
           AND
             f.fan_id = #{paramMap.myId}
@@ -204,46 +205,38 @@
 
     <select id="getMyFriendVlogList" parameterType="map" resultType="com.wzj.soopin.content.domain.vo.IndexVlogVO">
         SELECT
-            v.id as vlogId,
+            v.id AS vlogId,
-            v.member_id as memberId,
+            v.member_id AS memberId,
-            v.title as title,
+            v.title AS title,
-            v.title as content,
+            v.title AS content,
-            v.url as url,
+            v.url AS url,
-            v.cover as cover,
+            v.cover AS cover,
-            v.width as width,
+            v.width AS width,
-            v.height as height,
+            v.height AS height,
-            v.like_counts as likeCounts,
+            v.like_counts AS likeCounts,
-            v.comments_counts as commentsCounts,
+            v.comments_counts AS commentsCounts,
-            v.is_private as isPrivate,
+            v.is_private AS isPrivate,
-            v.city_code as cityCode,
+            v.city_code AS cityCode,
-            v.reason as reason,
+            v.reason AS reason,
-            v.status as status,
+            v.STATUS AS STATUS,
-            v.file_id as fileId,
+            v.file_id AS fileId,
-            v.first_frame_img as firstFrameImg,
+            v.first_frame_img AS firstFrameImg,
-            v.id as Id,
+            v.id AS Id,
-            m.avatar as avatar,
+            m.avatar AS avatar,
-            m.nickname as nickname
+            m.nickname AS nickname
         FROM
-          cont_vlog v
+            cont_vlog v
-        LEFT JOIN
+                LEFT JOIN ums_fans f ON v.member_id = f.vlogger_id
-          ums_fans f
+                LEFT JOIN ums_member m ON v.member_id = m.id
-        ON
-          v.member_id = f.fan_id
-        LEFT JOIN
-          ums_member m
-        ON
-          v.member_id = m.id
         WHERE
-          v.is_private = 0
+            v.is_private = 0
-          AND v.status = 1
+          AND v.STATUS = 1
           AND v.first_frame_img IS NOT NULL
-          AND
+          AND f.fan_id = #{paramMap.myId}
-            f.fan_id = #{paramMap.myId}
+          AND f.friend_flag = 1
-          AND
+          AND NOT EXISTS ( SELECT 1 FROM cms_vlog_member vm WHERE v.id = vm.vlog_id AND  vm.member_id= #{paramMap.myId} )
-            f.friend_flag = 1
         ORDER BY
-          v.create_time
+            v.create_time DESC
-        DESC
     </select>
 
 </mapper>

ruoyi-modules/ruoyi-goods/src/main/java/com/wzj/soopin/goods/controller/ProductController.java

@@ -52,7 +52,7 @@ public class ProductController extends BaseController {
     @Tag(name ="获取商品信息详细信息")
     @GetMapping(value = "/{id}")
     public R getInfo(@PathVariable("id") Long id) {
-        return R.ok(business.get(id));
+        return R.ok(business.info(id));
     }
 
     @Tag(name ="新增商品信息")

ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/business/IOrderBusiness.java

@@ -0,0 +1,8 @@
+package com.wzj.soopin.order.business;
+
+import com.wzj.soopin.order.domain.bo.OrderBo;
+import com.wzj.soopin.order.domain.vo.OrderVO;
+import org.dromara.common.web.core.IBusiness;
+
+public interface IOrderBusiness extends IBusiness<OrderVO, OrderBo> {
+}

ruoyi-modules/ruoyi-order/src/main/java/com/wzj/soopin/order/business/impl/OrderBusinessImpl.java

@@ -0,0 +1,49 @@
+package com.wzj.soopin.order.business.impl;
+
+import com.wzj.soopin.member.domain.po.Member;
+import com.wzj.soopin.member.service.IMemberService;
+import com.wzj.soopin.order.business.IOrderBusiness;
+import com.wzj.soopin.order.convert.OrderConvert;
+import com.wzj.soopin.order.convert.OrderItemConvert;
+import com.wzj.soopin.order.domain.bo.OrderBo;
+import com.wzj.soopin.order.domain.entity.Order;
+import com.wzj.soopin.order.domain.entity.OrderItem;
+import com.wzj.soopin.order.domain.vo.OrderItemVO;
+import com.wzj.soopin.order.domain.vo.OrderVO;
+import com.wzj.soopin.order.service.OrderItemService;
+import com.wzj.soopin.order.service.OrderService;
+import lombok.AllArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.dromara.common.web.core.BusinessImpl;
+import org.springframework.stereotype.Service;
+
+import java.io.Serializable;
+import java.util.List;
+import java.util.stream.Collectors;
+
+@Service
+@AllArgsConstructor
+@Slf4j
+public class OrderBusinessImpl extends BusinessImpl<OrderService, OrderConvert, OrderVO, OrderBo, Order> implements IOrderBusiness {
+    private final IMemberService memberService;
+    private final OrderItemService orderItemService;
+    private final OrderItemConvert orderItemConvert;
+
+    @Override
+    public OrderVO info(Serializable id) {
+        OrderVO vo= super.info(id);
+        Member member = memberService.getById(vo.getMemberId());
+        vo.setMemberNickname(member.getNickname());
+        vo.setMemberPhoneEncrypted(member.getPhoneHidden());
+
+        //设置明细
+        List<OrderItem> orderItemList = orderItemService.findByOrderId(vo.getId());
+        List<OrderItemVO> itemVOList = orderItemList.stream().map(item -> {
+            OrderItemVO itemVO=orderItemConvert.toVO(item);
+            //赋值
+            return itemVO;
+        }).collect(Collectors.toList());
+        vo.setItems(itemVOList);
+        return vo;
+    }
+}