order bug fix ;

order code opt;

share-admin/src/main/java/share/web/controller/system/SOrderController.java

@@ -5,8 +5,6 @@ import javax.servlet.http.HttpServletResponse;
 
 import io.swagger.annotations.ApiOperation;
 
-import com.baomidou.mybatisplus.core.conditions.Wrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.validation.annotation.Validated;

share-front/src/main/java/share/web/controller/system/SOrderController.java

@@ -58,7 +58,7 @@ public class SOrderController extends BaseController
         startPage();
         SConsumer user = FrontTokenComponent.getWxSConsumerEntry();
         sOrder.setConsumerId(user.getId());
-        List<SOrder> list = sOrderService.selectSOrderList(sOrder);
+        List<SOrderVo> list = sOrderService.selectSOrderVoList(sOrder);
         return getDataTable(list);
     }
 

share-system/src/main/java/share/system/domain/SOrder.java

@@ -137,34 +137,6 @@ public class SOrder extends BaseEntity
     @TableField(select = false)
     private Integer isDelete;
 
-
-    @TableField(exist = false)
     private Integer buyType;
 
-    //优惠卷名称
-    @TableField(exist = false)
-    private String couponName;
-
-    //套餐名称
-    @TableField(exist = false)
-    private String packName;
-
-    //门店名称
-    @TableField(exist = false)
-    private String storeName;
-
-    //房间名称
-    @TableField(exist = false)
-    private String roomName;
-
-    //房间图片
-    @TableField(exist = false)
-    private String roomImages;
-
-
-
-    //是否可以申请退款
-    @TableField(exist = false)
-    private Boolean isRefund;
-
 }

share-system/src/main/java/share/system/domain/vo/SOrderVo.java

@@ -197,4 +197,12 @@ public class SOrderVo
     @ApiModelProperty(name = "是否可以申请退款")
     private Boolean isRefund;
 
+    //优惠卷名称
+    @ApiModelProperty(name = "优惠卷名称")
+    private String couponName;
+
+    //套餐名称
+    @ApiModelProperty(name = "套餐名称")
+    private String packName;
+
 }

share-system/src/main/java/share/system/service/ISOrderService.java

@@ -37,6 +37,14 @@ public interface ISOrderService extends IService<SOrder>
     public List<SOrder> selectSOrderList(SOrder sOrder);
 
     /**
+     * 查询订单列表
+     *
+     * @param sOrder 订单
+     * @return 订单集合
+     */
+    public List<SOrderVo> selectSOrderVoList(SOrder sOrder);
+
+    /**
      * 新增订单
      * 
      * @param sOrder 订单