上传资金明细

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/dto/receiptPaymentDetails/ReceiptPaymentDetailsInfoVo.java

@@ -43,7 +43,7 @@ public class ReceiptPaymentDetailsInfoVo {
     @Schema(description = "部门类型 0-平台 1-商户 2-门店")
     @NotNull(message = "部门类型不能为空")
     @Min(value = 0, message = "部门类型最小值为0")
-    @Max(value = 2, message = "部门类型最大值为1")
+    @Max(value = 2, message = "部门类型最大值为2")
     private Integer deptType;
 	/**订单编号*/
     @Schema(description = "订单编号")

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/entity/AppGame.java

@@ -1,9 +1,6 @@
 package org.jeecg.modules.system.app.entity;
 
-import com.baomidou.mybatisplus.annotation.IdType;
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.Data;
@@ -138,4 +135,10 @@ public class AppGame implements Serializable {
     private BigDecimal latitude;
     @Schema(description = "经度")
     private BigDecimal  longitude;
+
+    /**存在的比赛地址*/
+    @Excel(name = "存在的比赛地址", width = 15)
+    @Schema(description = "存在的比赛地址")
+    @TableField(exist = false)
+    private String siteAddress;
 }

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/mapper/AppGameMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.jeecg.modules.app.dto.SearchDTO;
 import org.jeecg.modules.app.vo.SearchVO;
 import org.jeecg.modules.app.vo.game.FindByGameIdPriceVo;
@@ -37,4 +38,11 @@ public interface AppGameMapper extends BaseMapper<AppGame> {
     FindByIdResponse findById(@Param("id") String id,@Param("longitude")  double longitude,@Param("latitude")  double latitude);
 
     FindByGameIdPriceVo findByGameId(@Param("id") String id);
+
+
+    @Select(" select  a.*,COALESCE(a.address, c.address) AS siteAddress from nm_game a " +
+            " left join nm_site c on a.site_id = c.id  " +
+            " left join  nm_game_price_rules b on  a.id =b.game_id and b.del_flag =0 " +
+            " where b.id = #{priceRulesId}")
+    AppGame  findByPriceRules(@Param("priceRulesId") String priceRulesId);
 }

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/app/mapper/SeparateAccountsMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import org.apache.ibatis.annotations.Param;
+import org.apache.ibatis.annotations.Select;
 import org.jeecg.modules.system.app.dto.separateAccounts.FindAccountRequestDTO;
 import org.jeecg.modules.system.app.dto.separateAccounts.FindAccountResponseDTO;
 import org.jeecg.modules.system.app.entity.SeparateAccounts;
@@ -19,4 +20,8 @@ public interface SeparateAccountsMapper extends BaseMapper<SeparateAccounts> {
     IPage<FindAccountResponseDTO> findPage(@Param("page") Page<FindAccountResponseDTO> page, @Param("findAccountRequestDTO") FindAccountRequestDTO findAccountRequestDTO);
 
     SeparateAccounts findByDeptId(@Param("deptId") String deptId,@Param("id") String id);
+
+    @Select("select * from nm_separate_accounts where dept_id =#{deptId} ")
+    SeparateAccounts findByDeptIdAndStatus(@Param("deptId") String deptId);
+
 }

national-motion-module-system/national-motion-system-biz/src/main/java/org/jeecg/modules/system/mapper/SysDepartMapper.java

@@ -213,4 +213,7 @@ public interface SysDepartMapper extends BaseMapper<SysDepart> {
 	@Select("select * from sys_depart where del_flag=0 and org_category ='10' and depart_name =#{merchantName}")
 	SysDepart findByDepartName(@Param("merchantName") String merchantName);
 
+	@Select("SELECT p.*  FROM sys_depart c  JOIN sys_depart p  ON c.parent_id = p.id WHERE c.org_code = #{orgCode} and del_flag=0")
+    SysDepart findByOrgCodeAndParentId(@Param("orgCode") String orgCode);
+
 }