czg_team/cashier-admin-java
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/test' into test

Browse Source
This commit is contained in:
张松
2024-11-22 15:02:30 +08:00
parent 31965da486 3de6ed7080
commit 3a97990d51
3 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
eladmin-system/src/main/java/cn/ysk/cashier/dto/shop/TbShopInfoQueryCriteria.java
View File

@@ -35,7 +35,7 @@ public class TbShopInfoQueryCriteria{
private String account; private String account;
/** 精确 */ /** 精确 */
@Query(type = Query.Type.LEFT_LIKE) @Query(type = Query.Type.INNER_LIKE)
private String shopName; private String shopName;
/** 精确 */ /** 精确 */

2
eladmin-system/src/main/java/cn/ysk/cashier/pojo/shop/TbShopInfo.java
View File

@@ -274,7 +274,7 @@ public class TbShopInfo implements Serializable {
@Column(name = "consume_colony") @Column(name = "consume_colony")
@ApiModelProperty(value = "积分群体 all-所有 vip-仅针对会员") @ApiModelProperty(value = "积分群体 all-所有 vip-仅针对会员")
private String consumeColony; private String consumeColony = "all";
@Column(name = "is_table_fee") @Column(name = "is_table_fee")
@ApiModelProperty(value = "是否免除桌位费 0否1是") @ApiModelProperty(value = "是否免除桌位费 0否1是")

1
eladmin-system/src/main/java/cn/ysk/cashier/service/impl/shopimpl/TbShopInfoServiceImpl.java
View File

@@ -186,6 +186,7 @@ public class TbShopInfoServiceImpl implements TbShopInfoService {
tbShopInfo.setUpdatedAt(Instant.now().toEpochMilli()); tbShopInfo.setUpdatedAt(Instant.now().toEpochMilli());
tbShopInfo.setOnSale(1); tbShopInfo.setOnSale(1);
tbShopInfo.setIsOpenYhq(resources.getIsOpenYhq()); tbShopInfo.setIsOpenYhq(resources.getIsOpenYhq());
tbShopInfo.setConsumeColony("all");
//激活码 //激活码
TbMerchantRegister tbMerchantRegister = new TbMerchantRegister(); TbMerchantRegister tbMerchantRegister = new TbMerchantRegister();
if (resources.getRegisterCode() != null){ if (resources.getRegisterCode() != null){