bugfix:391订单评价

alien-entity/src/main/java/shop/alien/entity/store/vo/LifeUserOrderVo.java

@@ -142,6 +142,8 @@ public class LifeUserOrderVo {
     private String storeType;
     @ApiModelProperty(value = "团购/代金券结束时间")
     private Date endDate;
+    @ApiModelProperty(value = "是否评论")
+    private Boolean hasComment;
 
 
 

alien-entity/src/main/java/shop/alien/mapper/LifeUserOrderMapper.java

@@ -47,6 +47,7 @@ public interface LifeUserOrderMapper extends BaseMapper<LifeUserOrder> {
             "count(ocm.coupon_code) coupon_count,\n" +
             "simg.img_url,\n" +
             "lu.user_phone,\n" +
+            "IF(sc.id is null,false,true) as hasComment,\n" +
             "tc.*\n" +
             "from life_user_order luo\n" +
             "left join store_info si on si.id = luo.store_id and si.delete_flag = 0 -- 查询店铺相关 \n" +
@@ -54,6 +55,7 @@ public interface LifeUserOrderMapper extends BaseMapper<LifeUserOrder> {
             "left join order_coupon_middle ocm on ocm.order_id = luo.id and ocm.delete_flag = 0\n" +
             "inner join total_coupon tc on tc.coupon_id = ocm.coupon_id and tc.coupon_type = luo.coupon_type\n" +
             "left join  store_img simg on simg.id = tc.image_id and simg.delete_flag = 0 \n" +
+            "left join  store_comment sc on sc.business_id = luo.id and sc.delete_flag = 0 and sc.business_type = 5\n" +
             "${ew.customSqlSegment}")
     IPage<LifeUserOrderVo> queryUserOrderList(IPage<LifeUserOrderVo> brandedPage,@Param(Constants.WRAPPER) QueryWrapper<LifeUserOrderVo> lifeUserOrderQueryWrapper);
 

alien-store/src/main/java/shop/alien/store/controller/LifeUserOrderController.java

@@ -92,7 +92,7 @@ public class LifeUserOrderController {
             @ApiImplicitParam(name = "userId", value = "用户id", required = false),
             @ApiImplicitParam(name = "storeId", value = "商户id", required = false),
             @ApiImplicitParam(name = "couponType", value = "订单类型,-1,全部（可以不传）,1,代金券；2，团购；", required = false),
-            @ApiImplicitParam(name = "orderStatus", value = "订单状态,-1，全部（可以不传）；0，待支付;1，已支付/待使用;2，已核销；3，已过期;4，已取消;5.已退款，全退款了才算;6,退款失败;7,已完成", required = false),
+            @ApiImplicitParam(name = "orderStatus", value = "订单状态,-1，全部（可以不传）；1，已支付/待使用;2，已完成；5，退款/售后", required = false),
             @ApiImplicitParam(name = "name", value = "订单名称", required = false)
     })
     @GetMapping("/queryUserOrderList")