czg_team
/
cashier_server
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

霸王餐修改

This commit is contained in:
张松 2025-03-01 17:00:47 +08:00
parent be313b0de9
commit ee49017b41
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cash-api/account-server/src/main/java/com/czg/controller/admin/ShopUserController.java
View File

@ -7,6 +7,7 @@ import com.czg.account.dto.shopuser.ShopUserSummaryDTO;
import com.czg.account.entity.ShopUser; import com.czg.account.entity.ShopUser;
import com.czg.account.service.ShopUserService; import com.czg.account.service.ShopUserService;
import com.czg.annotation.SaAdminCheckPermission; import com.czg.annotation.SaAdminCheckPermission;
import com.czg.annotation.SaStaffCheckPermission;
import com.czg.enums.ShopUserFlowBizEnum; import com.czg.enums.ShopUserFlowBizEnum;
import com.czg.resp.CzgResult; import com.czg.resp.CzgResult;
import com.czg.sa.StpKit; import com.czg.sa.StpKit;
@ -95,6 +96,7 @@ public class ShopUserController {
* *
* @return 是否成功 * @return 是否成功
*/ */
@SaStaffCheckPermission("yun_xu_xiu_gai_hui_yuan_yu_e")
@SaAdminCheckPermission("shopUser:editFlow") @SaAdminCheckPermission("shopUser:editFlow")
@PutMapping("/money") @PutMapping("/money")
public CzgResult<Boolean> editMoney(@RequestBody @Validated ShopUserMoneyEditDTO shopUserMoneyEditDTO) { public CzgResult<Boolean> editMoney(@RequestBody @Validated ShopUserMoneyEditDTO shopUserMoneyEditDTO) {

2
cash-common/cash-common-service/src/main/java/com/czg/account/entity/FreeDineConfig.java
View File

@ -67,7 +67,7 @@ public class FreeDineConfig implements Serializable {
/** /**
* 使用类型 dine-in店内 takeout 自取 post快递，takeaway外卖 * 使用类型 dine-in店内 takeout 自取 post快递，takeaway外卖
*/ */
private String useType; // private String useType;
/** /**
* 门店id * 门店id

6
cash-service/account-service/src/main/java/com/czg/service/account/service/impl/FreeDineConfigServiceImpl.java
View File

@ -40,9 +40,9 @@ public class FreeDineConfigServiceImpl extends ServiceImpl<FreeDineConfigMapper,
throw new ApiNotPrintException("霸王餐信息未配置"); throw new ApiNotPrintException("霸王餐信息未配置");
} }
BeanUtil.copyProperties(freeDineConfigEditDTO, config); BeanUtil.copyProperties(freeDineConfigEditDTO, config);
if (freeDineConfigEditDTO.getUseType() != null && !freeDineConfigEditDTO.getUseType().isEmpty()) { // if (freeDineConfigEditDTO.getUseType() != null && !freeDineConfigEditDTO.getUseType().isEmpty()) {
config.setUseType(JSONObject.toJSONString(freeDineConfigEditDTO.getUseType())); // config.setUseType(JSONObject.toJSONString(freeDineConfigEditDTO.getUseType()));
} // }
return updateById(config); return updateById(config);
} }
} }