Merge branch 'dev' into test

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

@@ -41,7 +41,7 @@ public class SOrderController extends BaseController
      */
     @PreAuthorize("@ss.hasPermi('system:order:list')")
     @GetMapping("/list")
-    public TableDataInfoVo list(SOrder sOrder)
+    public TableDataInfoVo list(SOrderVo sOrder)
     {
         startPage();
         List<SOrder> list = sOrderService.selectSOrderList(sOrder);
@@ -71,7 +71,7 @@ public class SOrderController extends BaseController
     @PreAuthorize("@ss.hasPermi('system:order:export')")
     @Log(title = "订单", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
-    public void export(HttpServletResponse response, SOrder sOrder)
+    public void export(HttpServletResponse response, SOrderVo sOrder)
     {
         List<SOrderVo> list = sOrderService.exportList(sOrder);
         ExcelUtil<SOrderVo> util = new ExcelUtil<SOrderVo>(SOrderVo.class);

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

@@ -119,6 +119,12 @@ public class SOrderVo
     @Excel(name = "使用余额")
     private BigDecimal balance;
 
+    @Excel(name = "充值金额")
+    private BigDecimal rechargeAmount;
+
+    @Excel(name = "赠送金额")
+    private BigDecimal giftAmount;
+
     @ApiModelProperty(value = "优惠比例")
     @Excel(name = "优惠比例")
     private BigDecimal discountRatio;
@@ -276,4 +282,27 @@ public class SOrderVo
     //是否可以申请退款
     @ApiModelProperty(name = "是否可以申请退款")
     private Boolean isRefund;
+
+    @Excel(name = "次卡ID")
+    private Long secondaryCardId;
+
+    @Excel(name = "月卡ID")
+    private Long monthlyCardId;
+
+    @Excel(name = "历史订单号")
+    private String historicalOrderNo;
+
+    /**
+     * 支付开始时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    @TableField(select = false)
+    private Date startPayTime;
+
+    /**
+     * 支付结束时间
+     */
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm")
+    @TableField(select = false)
+    private Date endPayTime;
 }

share-system/src/main/java/share/system/mapper/SOrderMapper.java

@@ -2,6 +2,7 @@ package share.system.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import share.system.domain.SOrder;
+import share.system.domain.vo.SOrderVo;
 
 import java.util.HashMap;
 import java.util.List;
@@ -28,7 +29,7 @@ public interface SOrderMapper extends BaseMapper<SOrder>
      * @param sOrder 订单
      * @return 订单集合
      */
-    public List<SOrder> selectSOrderList(SOrder sOrder);
+    public List<SOrder> selectSOrderList(SOrderVo sOrder);
 
     /**
      * 新增订单
@@ -72,7 +73,7 @@ public interface SOrderMapper extends BaseMapper<SOrder>
 
     List<SOrder> selectSOrderByStoreIdAndMaxTime(SOrder order);
 
-    HashMap<String, Object> sumPrice(SOrder sOrder);
+    HashMap<String, Object> sumPrice(SOrderVo sOrder);
 
-    List<Long> couponIds(SOrder sOrder);
+    List<Long> couponIds(SOrderVo sOrder);
 }

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

@@ -39,7 +39,7 @@ public interface ISOrderService extends IService<SOrder>
      * @param sOrder 订单
      * @return 订单集合
      */
-    public List<SOrder> selectSOrderList(SOrder sOrder);
+    public List<SOrder> selectSOrderList(SOrderVo sOrder);
 
     /**
      * 查询订单列表
@@ -193,7 +193,7 @@ public interface ISOrderService extends IService<SOrder>
 
     int modifyOrder(SOrderDto sOrderDto);
 
-    TableDataInfoVo pageList(TableDataInfo dataTable, SOrder sOrder);
+    TableDataInfoVo pageList(TableDataInfo dataTable, SOrderVo sOrder);
 
     /**
      * 订单退款（人工退款）
@@ -209,7 +209,7 @@ public interface ISOrderService extends IService<SOrder>
 
     Boolean changeRoom(SOrderDto dto);
 
-    List<SOrderVo> exportList(SOrder sOrder);
+    List<SOrderVo> exportList(SOrderVo sOrder);
 
     List<SOrder> selectSOrderByMaxTime(SOrder orderQuery);
 
@@ -217,7 +217,7 @@ public interface ISOrderService extends IService<SOrder>
 
     OrderStatisticsResponse statistics(OrderStatisticsRequest request);
 
-    List<Long> couponIds(SOrder sOrder);
+    List<Long> couponIds(SOrderVo sOrder);
 
     List<OrderVo> statisticsOrderList(OrderStatisticsRequest request);
 }

share-system/src/main/java/share/system/service/impl/SOrderServiceImpl.java

@@ -218,7 +218,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
      * @return 订单
      */
     @Override
-    public List<SOrder> selectSOrderList(SOrder sOrder) {
+    public List<SOrder> selectSOrderList(SOrderVo sOrder) {
         return baseMapper.selectSOrderList(sOrder);
     }
 
@@ -380,7 +380,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
     }
 
     @Override
-    public TableDataInfoVo pageList(TableDataInfo dataTable, SOrder sOrder) {
+    public TableDataInfoVo pageList(TableDataInfo dataTable, SOrderVo sOrder) {
         List<SOrder> list = (List<SOrder>) dataTable.getRows();
         TableDataInfoVo tableDataInfo = new TableDataInfoVo();
         tableDataInfo.setCode(HttpStatus.SUCCESS);
@@ -785,7 +785,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
     }
 
     @Override
-    public List<SOrderVo> exportList(SOrder sOrder) {
+    public List<SOrderVo> exportList(SOrderVo sOrder) {
         List<SOrder> sOrders = selectSOrderList(sOrder);
         List<SOrderVo> sOrderVos = convertDosToVos(sOrders);
         List<SaobeiApiLog> saobeiApiLogs = saobeiApiLogService.list();
@@ -3469,7 +3469,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
     }
 
     @Override
-    public List<Long> couponIds(SOrder sOrder) {
+    public List<Long> couponIds(SOrderVo sOrder) {
         return baseMapper.couponIds(sOrder);
     }
 

share-system/src/main/java/share/system/service/impl/SecondaryCardLogServiceImpl.java

@@ -4,9 +4,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import share.common.utils.DateUtils;
-import share.system.domain.SConsumer;
 import share.system.domain.SecondaryCardLog;
-import share.system.domain.vo.FrontTokenComponent;
 import share.system.domain.vo.SecondaryCardLogVo;
 import share.system.mapper.SecondaryCardLogMapper;
 import share.system.service.SecondaryCardLogService;
@@ -43,8 +41,6 @@ public class SecondaryCardLogServiceImpl extends ServiceImpl<SecondaryCardLogMap
      */
     @Override
     public List<SecondaryCardLogVo> selectSecondaryCardLogList(SecondaryCardLogVo secondaryCardLog) {
-        SConsumer user = FrontTokenComponent.getWxSConsumerEntry();
-        secondaryCardLog.setConsumerId(user.getId());
         return secondaryCardLogMapper.selectSecondaryCardLogList(secondaryCardLog);
     }