修改领取优惠券方法

ruoyi-admin/src/main/java/com/ruoyi/app/order/PosOrderController.java

@@ -41,6 +41,7 @@ import com.ruoyi.system.domain.*;
 import com.ruoyi.system.domain.vo.OrderDTO;
 import com.ruoyi.system.mapper.PosFoodMapper;
 import com.ruoyi.system.mapper.PosOrderMapper;
+import com.ruoyi.system.mapper.PosOrderPromotionMapper;
 import com.ruoyi.system.mapper.RiderPositionMapper;
 import com.ruoyi.system.mapper.UserBillingMapper;
 import com.ruoyi.system.service.*;
@@ -145,6 +146,8 @@ public class PosOrderController extends BaseController {
     private PosOrderShOprateController shOprateController;
     @Autowired
     private OrderLogHelper orderLogHelper;
+    @Autowired
+    private PosOrderPromotionMapper posOrderPromotionMapper;
 
 
     //查询用户足迹
@@ -645,6 +648,9 @@ public class PosOrderController extends BaseController {
         org.put("food", JSONArray.parseArray(orlist.getFood()));
         Long count = posOrderRatingService.getBaseMapper().selectCount(new QueryWrapper<PosOrderRating>().eq("dd_id", ddid));
         org.put("isCommented", count > 0);
+        // 查询促销快照明细
+        List<PosOrderPromotion> promotions = posOrderPromotionMapper.selectByOrderId(orlist.getId());
+        org.put("promotions", promotions);
         return success(org);
     }
 

ruoyi-admin/src/main/java/com/ruoyi/app/user/UserPromotionCalcController.java

@@ -64,6 +64,6 @@ public class UserPromotionCalcController extends BaseController {
         }
 
         PromotionCalcResponse result = promotionCalcService.calculate(request, Long.valueOf(userId));
-        return AjaxResult.success(result);
+        return AjaxResult.success("",result);
     }
 }