zoujiajian преди 3 години
родител
ревизия
fa0eeb66b1

+ 0 - 3
netflix-dao/src/main/java/com/cyksj/mapper/OrderDonMapper.java

@@ -4,7 +4,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.cyksj.model.entity.OrderDon;
 import com.cyksj.model.entity.RealGoodsInterestUser;
 import com.cyksj.model.excel.ExcelOrderDonInfo;
-import com.cyksj.model.manage.views.OrderDonView;
 import com.cyksj.model.views.BrokenLineObjView;
 import com.cyksj.model.views.ChannelPopularizeView;
 import com.cyksj.model.views.ChannelStatisticsView;
@@ -30,8 +29,6 @@ public interface OrderDonMapper extends BaseMapper<OrderDon> {
 
 	void updateHasPaymentInterestRealGoodsPayTime();
 
-	OrderDonView getOrderDetail(Long orderId);
-
 	BrokenLineObjView selectPlatBrokenLineMoney(@Param("first") String first, @Param("end") String end);
 
 	BrokenLineObjView selectPersonDistributeBrokenLine(@Param("userId") Long userId, @Param("first") String first, @Param("end") String end);

+ 0 - 15
netflix-dao/src/main/resources/mapper/OrderDonMapper.xml

@@ -71,21 +71,6 @@
                 select id from `order_don` where user_id = s.user_id and goods_id = s.goods_id and status !='close')
     </select>
 
-    <select id="getOrderDetail" resultType="com.cyksj.model.manage.views.OrderDonView">
-        select od.*,
-               gdk.spec_val,
-               gd.title,
-               gd.logo,
-               gd.second_type,
-               gd.type as goodsDonType,
-               gd.pay_desc,
-               gd.special_type
-        from `order_don` od
-                 left join `goods_don_sku` gdk on gdk.id = od.sku_id
-                 left join `goods_don` gd on gd.id = od.goods_id
-        where od.id = #{orderId}
-    </select>
-
     <select id="selectPlatBrokenLineMoney" resultType="com.cyksj.model.views.BrokenLineObjView">
         select min(curdate) as firstDate,
                max(curdate) as lastDate

+ 1 - 2
netflix-web/src/main/java/com/cyksj/web/controller/payment/OrderController.java

@@ -29,7 +29,6 @@ import com.cyksj.model.request.OrderPayRequest;
 import com.cyksj.model.response.AliPayTradeStatus;
 import com.cyksj.model.views.GoodsDonSkuView;
 import com.cyksj.model.views.OrderCommentView;
-import com.cyksj.redis.RedisService;
 import com.cyksj.service.order.OrderDonService;
 import com.cyksj.service.paypal.PayPalService;
 import com.cyksj.service.paypal.PaypalPayConfigService;
@@ -397,7 +396,7 @@ public class OrderController {
         if (orderId < 1) {
             throw BusinessRuntimeException.getInstance("订单不存在");
         }
-        OrderDonView orderDonView = orderDonMapper.getOrderDetail(orderId);
+        OrderDonView orderDonView = beanSearcher.searchFirst(OrderDonView.class, MapUtils.builder().field(OrderDonView::getId, orderId).build());
         if (orderDonView == null) {
             throw BusinessRuntimeException.getInstance("订单不存在");
         }