feat:studio

api/src/main/java/com/jiejing/fitness/finance/api/cashier/request/PageStudioCashierRequest.java

@@ -23,6 +23,9 @@ import lombok.NoArgsConstructor;
 @ApiModel(description = "分页查询场馆收银流水Request")
 @ApiModel(description = "分页查询场馆收银流水Request")
 public class PageStudioCashierRequest {
 public class PageStudioCashierRequest {
 
 
+  @ApiModelProperty(value = "场馆名称")
+  private String studioName;
+
   @ApiModelProperty(value = "场馆订单号")
   @ApiModelProperty(value = "场馆订单号")
   private String orderNo;
   private String orderNo;
 
 

api/src/main/java/com/jiejing/fitness/finance/api/cashier/vo/StudioCashierRecordVO.java

@@ -47,6 +47,9 @@ public class StudioCashierRecordVO {
   @ApiModelProperty("场馆ID")
   @ApiModelProperty("场馆ID")
   private Long studioId;
   private Long studioId;
 
 
+  @ApiModelProperty(value = "场馆名称")
+  private String studioName;
+
   @ApiModelProperty("商户ID")
   @ApiModelProperty("商户ID")
   private Long merchantId;
   private Long merchantId;
 
 

app/src/main/java/com/jiejing/fitness/finance/app/controller/cashier/StudioCashierController.java

@@ -29,7 +29,7 @@ public class StudioCashierController implements StudioCashierApi {
   private StudioCashierService studioCashierService;
   private StudioCashierService studioCashierService;
 
 
   @ApiOperation(value = "分页筛选收银流水", tags = {TAG})
   @ApiOperation(value = "分页筛选收银流水", tags = {TAG})
-  @PostMapping(value = "/private/brandCashier/page")
+  @PostMapping(value = "private/studioCashier/page")
   @Override
   @Override
   public JsonResult<PageVO<StudioCashierRecordVO>> page(
   public JsonResult<PageVO<StudioCashierRecordVO>> page(
       @Valid @RequestBody PageStudioCashierRequest request) {
       @Valid @RequestBody PageStudioCashierRequest request) {
@@ -38,14 +38,14 @@ public class StudioCashierController implements StudioCashierApi {
   }
   }
 
 
   @ApiOperation(value = "查询收银流水详情", tags = {TAG})
   @ApiOperation(value = "查询收银流水详情", tags = {TAG})
-  @PostMapping(value = "/private/brandCashier/getById")
+  @PostMapping(value = "/private/studioCashier/getById")
   @Override
   @Override
   public JsonResult<StudioCashierRecordVO> getById(@Valid @RequestBody GetStudioCashierByIdRequest request) {
   public JsonResult<StudioCashierRecordVO> getById(@Valid @RequestBody GetStudioCashierByIdRequest request) {
     return JsonResult.success(studioCashierService.getById(request.getId()));
     return JsonResult.success(studioCashierService.getById(request.getId()));
   }
   }
 
 
   @ApiOperation(value = "根据订单号查询收银列表", tags = {TAG})
   @ApiOperation(value = "根据订单号查询收银列表", tags = {TAG})
-  @PostMapping(value = "/private/brandCashier/listByOrderNo")
+  @PostMapping(value = "/private/studioCashier/listByOrderNo")
   @Override
   @Override
   public JsonResult<List<StudioCashierRecordVO>> listByOrderNo(
   public JsonResult<List<StudioCashierRecordVO>> listByOrderNo(
       @Valid @RequestBody ListStudioCashierByOrderNoRequest request) {
       @Valid @RequestBody ListStudioCashierByOrderNoRequest request) {

repository/src/main/java/com/jiejing/fitness/finance/repository/entity/StudioCashierRecord.java

@@ -81,6 +81,11 @@ public class StudioCashierRecord implements Serializable {
   private Long studioId;
   private Long studioId;
 
 
   /**
   /**
+   * 场馆名称
+   */
+  private String studioName;
+
+  /**
    * 备注: 商户ID 是否允许为null: YES
    * 备注: 商户ID 是否允许为null: YES
    */
    */
   private Long merchantId;
   private Long merchantId;
@@ -205,6 +210,8 @@ public class StudioCashierRecord implements Serializable {
 
 
   public static final String STUDIO_ID = "studio_id";
   public static final String STUDIO_ID = "studio_id";
 
 
+  public static final String STUDIO_NAME = "studio_name";
+
   public static final String MERCHANT_ID = "merchant_id";
   public static final String MERCHANT_ID = "merchant_id";
 
 
   public static final String MERCHANT_NO = "merchant_no";
   public static final String MERCHANT_NO = "merchant_no";

repository/src/main/java/com/jiejing/fitness/finance/repository/mapper/StudioCashierRecordMapper.xml

@@ -17,11 +17,12 @@
 
 
   <!-- 通用查询结果列 -->
   <!-- 通用查询结果列 -->
   <sql id="Base_Column_List">
   <sql id="Base_Column_List">
-    id, trans_no, order_no, order_type, trans_type, brand_id, studio_id, merchant_id, merchant_no, channel_no, sub_channel, trans_amount, fee_rate, fee, actual_amount, trans_state, buyer_name, buyer_phone, goods, remark, exist_related_trans, related_trans_no, third_trans_no, fail_message, trading_time, success_time, in_time, create_time, update_time
+    id, trans_no, order_no, order_type, trans_type, brand_id, studio_id, studio_name, merchant_id, merchant_no, channel_no, sub_channel, trans_amount, fee_rate, fee, actual_amount, trans_state, buyer_name, buyer_phone, goods, remark, exist_related_trans, related_trans_no, third_trans_no, fail_message, trading_time, success_time, in_time, create_time, update_time
   </sql>
   </sql>
+
   <select id="sumRefundActualAmountByPayTransNo" resultType="java.math.BigDecimal">
   <select id="sumRefundActualAmountByPayTransNo" resultType="java.math.BigDecimal">
     select sum(actual_amount)
     select sum(actual_amount)
-    from brand_cashier_record
+    from studio_cashier_record
     where related_trans_no = #{payTransNo}
     where related_trans_no = #{payTransNo}
       and trans_state in (6, 7)
       and trans_state in (6, 7)
   </select>
   </select>

repository/src/main/java/com/jiejing/fitness/finance/repository/query/PageBrandCashierRecordQuery.java

@@ -36,6 +36,11 @@ public class PageBrandCashierRecordQuery {
   private String studioId;
   private String studioId;
 
 
   /**
   /**
+   * 场馆名称
+   */
+  private String studioName;
+
+  /**
    * 购买人姓名
    * 购买人姓名
    */
    */
   private String buyerName;
   private String buyerName;

repository/src/main/java/com/jiejing/fitness/finance/repository/service/StudioCashierRecordRpService.java

@@ -87,6 +87,9 @@ public class StudioCashierRecordRpService extends
     if (null != query.getSuccessEndTime()) {
     if (null != query.getSuccessEndTime()) {
       wrapper.le(StudioCashierRecord.SUCCESS_TIME, query.getSuccessEndTime());
       wrapper.le(StudioCashierRecord.SUCCESS_TIME, query.getSuccessEndTime());
     }
     }
+    if (StringUtil.isNotBlank(query.getStudioName())) {
+      wrapper.eq(StudioCashierRecord.SUCCESS_TIME, query.getSuccessEndTime());
+    }
     return this.findByWrapperPage(wrapper, query.getCurrent(), query.getSize());
     return this.findByWrapperPage(wrapper, query.getCurrent(), query.getSize());
   }
   }
 }
 }

service/src/main/java/com/jiejing/fitness/finance/service/cashier/params/PageStudioCashierParams.java

@@ -35,6 +35,9 @@ public class PageStudioCashierParams {
   @ApiModelProperty(value = "场馆ID")
   @ApiModelProperty(value = "场馆ID")
   private String studioId;
   private String studioId;
 
 
+  @ApiModelProperty(value = "场馆名称")
+  private String studioName;
+
   @ApiModelProperty(value = "购买人姓名")
   @ApiModelProperty(value = "购买人姓名")
   private String buyerName;
   private String buyerName;
 
 

service/src/main/java/com/jiejing/fitness/finance/service/pay/convert/PayConvert.java

@@ -73,6 +73,7 @@ public class PayConvert {
         .transType(BrandCashierTransTypeEnum.PAY)
         .transType(BrandCashierTransTypeEnum.PAY)
         .brandId(studio.getBrandId())
         .brandId(studio.getBrandId())
         .studioId(params.getStudioId())
         .studioId(params.getStudioId())
+        .studioName(studio.getName())
         .merchantId(merchant.getId())
         .merchantId(merchant.getId())
         .merchantNo(merchant.getMerchantNo())
         .merchantNo(merchant.getMerchantNo())
         .channelNo(merchant.getChannelNo())
         .channelNo(merchant.getChannelNo())