fix

zhongzheng-admin/src/main/java/com/zhongzheng/controller/order/OrderCouponController.java

@@ -0,0 +1,94 @@
+package com.zhongzheng.controller.order;
+
+import java.util.List;
+import java.util.Arrays;
+
+import com.zhongzheng.modules.order.bo.OrderCouponEditBo;
+import com.zhongzheng.modules.order.bo.OrderCouponQueryBo;
+import com.zhongzheng.modules.order.domain.OrderCoupon;
+import com.zhongzheng.modules.order.domain.OrderGoods;
+import com.zhongzheng.modules.order.service.IOrderCouponService;
+import com.zhongzheng.modules.order.vo.OrderCouponVo;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+import com.zhongzheng.common.annotation.Log;
+import com.zhongzheng.common.core.controller.BaseController;
+import com.zhongzheng.common.core.domain.AjaxResult;
+import com.zhongzheng.common.enums.BusinessType;
+import com.zhongzheng.common.utils.poi.ExcelUtil;
+import com.zhongzheng.common.core.page.TableDataInfo;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+
+/**
+ * 订单优惠券 Controller
+ *
+ * @author hjl
+ * @date 2021-07-20
+ */
+@Api(value = "订单优惠券 控制器", tags = {"订单优惠券 管理"})
+@RequiredArgsConstructor(onConstructor_ = @Autowired)
+@RestController
+@RequestMapping("/order/coupon")
+public class OrderCouponController extends BaseController {
+
+    private final IOrderCouponService iOrderCouponService;
+
+    /**
+     * 查询订单优惠券 列表
+     */
+    @ApiOperation("查询订单优惠券 列表")
+    @PreAuthorize("@ss.hasPermi('order:coupon:list')")
+    @GetMapping("/list")
+    public AjaxResult<List<OrderCoupon>>list(OrderCouponQueryBo bo) {
+        List<OrderCoupon> list = iOrderCouponService.queryOrderCouponList(bo);
+        return AjaxResult.success(list);
+    }
+
+    /**
+     * 导出订单优惠券 列表
+     */
+   /* @ApiOperation("导出订单优惠券 列表")
+    @PreAuthorize("@ss.hasPermi('system:coupon:export')")
+    @Log(title = "订单优惠券 ", businessType = BusinessType.EXPORT)
+    @GetMapping("/export")
+    public AjaxResult<OrderCouponVo> export(OrderCouponQueryBo bo) {
+        List<OrderCouponVo> list = iOrderCouponService.queryList(bo);
+        ExcelUtil<OrderCouponVo> util = new ExcelUtil<OrderCouponVo>(OrderCouponVo.class);
+        return util.exportExcel(list, "订单优惠券 ");
+    }*/
+
+    /**
+     * 获取订单优惠券 详细信息
+     */
+    @ApiOperation("获取订单优惠券 详细信息")
+    @PreAuthorize("@ss.hasPermi('order:coupon:query')")
+    @GetMapping("/{id}")
+    public AjaxResult<OrderCouponVo> getInfo(@PathVariable("id" ) Long id) {
+        return AjaxResult.success(iOrderCouponService.queryById(id));
+    }
+
+
+
+    /**
+     * 修改订单优惠券
+     */
+    @ApiOperation("修改订单优惠券 ")
+    @PreAuthorize("@ss.hasPermi('order:coupon:edit')")
+    @Log(title = "订单优惠券 ", businessType = BusinessType.UPDATE)
+    @PutMapping()
+    public AjaxResult<Void> edit(@RequestBody OrderCouponEditBo bo) {
+        return toAjax(iOrderCouponService.updateByEditBo(bo) ? 1 : 0);
+    }
+
+
+}

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/domain/OrderCoupon.java

@@ -42,4 +42,16 @@ private static final long serialVersionUID=1L;
     @TableField(fill = FieldFill.INSERT_UPDATE)
     private Long updateTime;
 
+    /** 活动名 */
+    @TableField(exist = false)
+    private String activityName;
+
+    /** 金额 */
+    @TableField(exist = false)
+    private BigDecimal price;
+
+    /** 优惠券类型 */
+    @TableField(exist = false)
+    private Integer couponType;
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/mapper/OrderCouponMapper.java

@@ -2,8 +2,11 @@ package com.zhongzheng.modules.order.mapper;
 
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.zhongzheng.modules.order.bo.OrderCouponQueryBo;
 import com.zhongzheng.modules.order.domain.OrderCoupon;
 
+import java.util.List;
+
 /**
  * 订单优惠券 Mapper接口
  *
@@ -12,4 +15,6 @@ import com.zhongzheng.modules.order.domain.OrderCoupon;
  */
 public interface OrderCouponMapper extends BaseMapper<OrderCoupon> {
 
+    List<OrderCoupon> queryOrderCouponList(OrderCouponQueryBo bo);
+
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/IOrderCouponService.java

@@ -5,7 +5,9 @@ import com.baomidou.mybatisplus.extension.service.IService;
 import com.zhongzheng.modules.order.bo.OrderCouponAddBo;
 import com.zhongzheng.modules.order.bo.OrderCouponEditBo;
 import com.zhongzheng.modules.order.bo.OrderCouponQueryBo;
+import com.zhongzheng.modules.order.bo.OrderGoodsQueryBo;
 import com.zhongzheng.modules.order.domain.OrderCoupon;
+import com.zhongzheng.modules.order.domain.OrderGoods;
 import com.zhongzheng.modules.order.vo.OrderCouponVo;
 
 import java.util.Collection;
@@ -26,6 +28,8 @@ public interface IOrderCouponService extends IService<OrderCoupon> {
 
 	OrderCoupon queryBySn(String orderSn);
 
+	List<OrderCoupon> queryOrderCouponList(OrderCouponQueryBo bo);
+
 	/**
 	 * 查询列表
 	 */

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderCouponServiceImpl.java

@@ -10,8 +10,10 @@ import com.zhongzheng.modules.order.bo.OrderCouponEditBo;
 import com.zhongzheng.modules.order.bo.OrderCouponQueryBo;
 import com.zhongzheng.modules.order.domain.OrderCoupon;
 import com.zhongzheng.modules.order.mapper.OrderCouponMapper;
+import com.zhongzheng.modules.order.mapper.OrderGoodsMapper;
 import com.zhongzheng.modules.order.service.IOrderCouponService;
 import com.zhongzheng.modules.order.vo.OrderCouponVo;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
@@ -33,6 +35,9 @@ import java.util.stream.Collectors;
 @Service
 public class OrderCouponServiceImpl extends ServiceImpl<OrderCouponMapper, OrderCoupon> implements IOrderCouponService {
 
+    @Autowired
+    private OrderCouponMapper orderCouponMapper;
+
     @Override
     public OrderCouponVo queryById(Long id){
         OrderCoupon db = this.baseMapper.selectById(id);
@@ -50,6 +55,11 @@ public class OrderCouponServiceImpl extends ServiceImpl<OrderCouponMapper, Order
         return null;
     }
 
+    @Override
+    public List<OrderCoupon> queryOrderCouponList(OrderCouponQueryBo bo) {
+        return orderCouponMapper.queryOrderCouponList(bo);
+    }
+
     @Override
     public List<OrderCouponVo> queryList(OrderCouponQueryBo bo) {
         LambdaQueryWrapper<OrderCoupon> lqw = Wrappers.lambdaQuery();

zhongzheng-system/src/main/resources/mapper/modules/order/OrderCouponMapper.xml

@@ -10,7 +10,25 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="couponId" column="coupon_id"/>
         <result property="createTime" column="create_time"/>
         <result property="updateTime" column="update_time"/>
+        <result property="activityName" column="activity_name"/>
+        <result property="price" column="price"/>
+        <result property="couponType" column="coupon_type"/>
     </resultMap>
 
+    <select id="queryOrderCouponList" resultMap="OrderCouponResult">
+        SELECT
+        ac.activity_name,
+        c.price,
+        c.coupon_type
+        FROM
+        order_coupon oc
+        LEFT JOIN coupon c ON oc.coupon_id = c.coupon_id
+        LEFT JOIN activity_configuration ac ON c.configuration_id = ac.id
+        <if test="orderSn != null and orderSn != ''" >
+            WHERE
+            temp.order_sn = #{orderSn}
+        </if>
+    </select>
+
 
 </mapper>