zenghuapei
/
cyywl_server
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: zenghuapei:a1b65ab051b09a3a8e4a6923e5d01f8a65df2c80
Branches Tags
zenghuapei:master
zenghuapei:test
zenghuapei:feature/mall_product
...
compare: zenghuapei:095e70b4ab69bcbc22574eb067386d08eba13888
Branches Tags
zenghuapei:master
zenghuapei:test
zenghuapei:feature/mall_product

3 Commits
a1b65ab051 ... 095e70b4ab

Author SHA1 Message Date
perry 095e70b4ab Merge remote-tracking branch 'origin/master' 2023-05-30 19:36:56 +08:00
perry 5b9b503f33 Merge remote-tracking branch 'origin/feature/mall_product' into feature/mall_product_new 2023-05-30 19:36:18 +08:00
perry e6cad45706 抽佣 2023-05-30 19:36:05 +08:00
2 changed files with 3 additions and 3 deletions
Show Stats Expand all files Collapse all files

2
yudao-module-mall/yudao-module-shop-biz/src/main/java/cn/iocoder/yudao/module/shop/controller/admin/recharge/vo/PromoterDrawReqVO.java
View File

@ -18,7 +18,7 @@ public class PromoterDrawReqVO extends PageParam {
private Long tenantId; private Long tenantId;
@Schema(description = "组织名称") @Schema(description = "商户名称")
private String deptName; private String deptName;
@Schema(description = "组织结构名称") @Schema(description = "组织结构名称")
private String parentOrganizationName; private String parentOrganizationName;

4
yudao-module-mall/yudao-module-shop-biz/src/main/resources/mapper/recharge/RechargeOrderMapper.xml
View File

@ -40,10 +40,10 @@
<if test="data.nickname!=null and data.nickname!=''"> <if test="data.nickname!=null and data.nickname!=''">
and d.nickname=#{data.nickname} and d.nickname=#{data.nickname}
</if> </if>
<if test="data.createTime !=null "> <if test="data.createTime !=null and data.createTime.length>=1">
and a.create_time &gt;=#{data.createTime[0]} and a.create_time &gt;=#{data.createTime[0]}
</if> </if>
<if test="data.createTime !=null "> <if test="data.createTime !=null and data.createTime.length>=2">
and a.create_time &lt;=#{data.createTime[1]} and a.create_time &lt;=#{data.createTime[1]}
</if> </if>
</where> </where>