bonus
/
Bonus-Cloud-JYY-Smart-Canteen
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

账户管理

This commit is contained in:
gaowdong 2025-05-26 17:37:45 +08:00
parent e774797e59
commit ecd11efce1
16 changed files with 179 additions and 179 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

72
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/business/AccWalletInfoBusiness.java
View File

@ -6,7 +6,7 @@ import com.alibaba.fastjson.JSONObject;
import com.bonus.canteen.core.account.constants.AccTradeStateEnum; import com.bonus.canteen.core.account.constants.AccTradeStateEnum;
import com.bonus.canteen.core.account.constants.AccTradeTypeEnum; import com.bonus.canteen.core.account.constants.AccTradeTypeEnum;
import com.bonus.canteen.core.account.constants.WalletBalanceOperationEnum; import com.bonus.canteen.core.account.constants.WalletBalanceOperationEnum;
import com.bonus.canteen.core.account.domain.AccTrade; import com.bonus.canteen.core.account.domain.AccountTrade;
import com.bonus.canteen.core.account.domain.AccTradeWalletDetail; import com.bonus.canteen.core.account.domain.AccTradeWalletDetail;
import com.bonus.canteen.core.account.domain.AccWalletInfo; import com.bonus.canteen.core.account.domain.AccWalletInfo;
import com.bonus.canteen.core.account.domain.WalletUpdateDTO; import com.bonus.canteen.core.account.domain.WalletUpdateDTO;
@ -150,25 +150,25 @@ public class AccWalletInfoBusiness {
accTradeWalletDetail.setCreateBy(StringUtils.isBlank(operation.getOperationUser()) ? accTradeWalletDetail.setCreateBy(StringUtils.isBlank(operation.getOperationUser()) ?
SecurityUtils.getUsername() : operation.getOperationUser()); SecurityUtils.getUsername() : operation.getOperationUser());
this.accTradeWalletDetailService.insertAccTradeWalletDetail(accTradeWalletDetail); this.accTradeWalletDetailService.insertAccTradeWalletDetail(accTradeWalletDetail);
AccTrade accTrade = new AccTrade(); AccountTrade accountTrade = new AccountTrade();
accTrade.setTradeId(tradeId); accountTrade.setTradeId(tradeId);
accTrade.setPayState(PayStateEnum.PAY_SUCC.getKey()); accountTrade.setPayState(PayStateEnum.PAY_SUCC.getKey());
accTrade.setTradeState(AccTradeStateEnum.TAKE_EFFECT.getKey()); accountTrade.setTradeState(AccTradeStateEnum.TAKE_EFFECT.getKey());
accTrade.setUpdateBy(StringUtils.isBlank(operation.getOperationUser()) ? accountTrade.setUpdateBy(StringUtils.isBlank(operation.getOperationUser()) ?
SecurityUtils.getUsername() : operation.getOperationUser()); SecurityUtils.getUsername() : operation.getOperationUser());
accTrade.setWalletBalTotal(walletBalByWalletId); accountTrade.setWalletBalTotal(walletBalByWalletId);
accTrade.setAccountAllBal(walletBalByWalletId); accountTrade.setAccountAllBal(walletBalByWalletId);
accTrade.setMachineSn(operation.getDeviceSn()); accountTrade.setMachineSn(operation.getDeviceSn());
this.accTradeService.updateAccTrade(accTrade); this.accTradeService.updateAccTrade(accountTrade);
}catch (Exception ex) { }catch (Exception ex) {
if(Objects.nonNull(tradeId)) { if(Objects.nonNull(tradeId)) {
AccTrade accTrade = new AccTrade(); AccountTrade accountTrade = new AccountTrade();
accTrade.setTradeId(tradeId); accountTrade.setTradeId(tradeId);
accTrade.setPayState(PayStateEnum.PAY_FAIL.getKey()); accountTrade.setPayState(PayStateEnum.PAY_FAIL.getKey());
accTrade.setTradeState(AccTradeStateEnum.CANCELED.getKey()); accountTrade.setTradeState(AccTradeStateEnum.CANCELED.getKey());
accTrade.setUpdateBy(SecurityUtils.getUsername()); accountTrade.setUpdateBy(SecurityUtils.getUsername());
accTrade.setFailReason(StringUtils.substring(ex.getMessage(), 0, 100)); accountTrade.setFailReason(StringUtils.substring(ex.getMessage(), 0, 100));
this.accTradeService.updateAccTrade(accTrade); this.accTradeService.updateAccTrade(accountTrade);
} }
log.error("修改钱包失败", ex); log.error("修改钱包失败", ex);
throw new ServiceException("修改钱包失败"); throw new ServiceException("修改钱包失败");
@ -202,31 +202,31 @@ public class AccWalletInfoBusiness {
sysUser = JSONObject.parseObject(JSON.toJSONString(userResult.get(AjaxResult.DATA_TAG)), SysUser.class); sysUser = JSONObject.parseObject(JSON.toJSONString(userResult.get(AjaxResult.DATA_TAG)), SysUser.class);
} }
LocalDateTime tradeTime = LocalDateTime.now(); LocalDateTime tradeTime = LocalDateTime.now();
AccTrade accTrade = new AccTrade(); AccountTrade accountTrade = new AccountTrade();
accTrade.setTradeTime(tradeTime); accountTrade.setTradeTime(tradeTime);
accTrade.setTradeType(operation.getTradeType()); accountTrade.setTradeType(operation.getTradeType());
accTrade.setAmount(operation.getAmount()); accountTrade.setAmount(operation.getAmount());
accTrade.setActualAmount(operation.getAmount()); accountTrade.setActualAmount(operation.getAmount());
accTrade.setWalletBalTotal(accBalTotal); accountTrade.setWalletBalTotal(accBalTotal);
accTrade.setAccountAllBal(accBalTotal); accountTrade.setAccountAllBal(accBalTotal);
accTrade.setPayState(PayStateEnum.PAY_INPROCESS.getKey()); accountTrade.setPayState(PayStateEnum.PAY_INPROCESS.getKey());
accTrade.setTradeState(AccTradeStateEnum.CREATE.getKey()); accountTrade.setTradeState(AccTradeStateEnum.CREATE.getKey());
accTrade.setUserId(operation.getUserId()); accountTrade.setUserId(operation.getUserId());
accTrade.setPayChannel(operation.getPayChannel()); accountTrade.setPayChannel(operation.getPayChannel());
accTrade.setPayType(operation.getPayType()); accountTrade.setPayType(operation.getPayType());
accTrade.setCreateBy(StringUtils.isBlank(operation.getOperationUser()) ? accountTrade.setCreateBy(StringUtils.isBlank(operation.getOperationUser()) ?
SecurityUtils.getUsername() : operation.getOperationUser()); SecurityUtils.getUsername() : operation.getOperationUser());
accTrade.setUpdateBy(StringUtils.isBlank(operation.getOperationUser()) ? accountTrade.setUpdateBy(StringUtils.isBlank(operation.getOperationUser()) ?
SecurityUtils.getUsername() : operation.getOperationUser()); SecurityUtils.getUsername() : operation.getOperationUser());
if(Objects.nonNull(sysUser)) { if(Objects.nonNull(sysUser)) {
accTrade.setDeptId(sysUser.getDeptId()); accountTrade.setDeptId(sysUser.getDeptId());
} }
if(Objects.nonNull(operation.getOrderNo())) { if(Objects.nonNull(operation.getOrderNo())) {
accTrade.setOrderNo(operation.getOrderNo()); accountTrade.setOrderNo(operation.getOrderNo());
} }
accTrade.setMachineSn(operation.getDeviceSn()); accountTrade.setMachineSn(operation.getDeviceSn());
this.accTradeService.insertAccTrade(accTrade); this.accTradeService.insertAccTrade(accountTrade);
return accTrade.getTradeId(); return accountTrade.getTradeId();
} }
public List<AccWalletInfo> selectAccWalletInfoByUserId(Long userId) { public List<AccWalletInfo> selectAccWalletInfoByUserId(Long userId) {

48
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/controller/AccCardController.java
View File

@ -2,7 +2,7 @@ package com.bonus.canteen.core.account.controller;
import com.bonus.canteen.core.account.constants.CardRecordTypeEnum; import com.bonus.canteen.core.account.constants.CardRecordTypeEnum;
import com.bonus.canteen.core.account.constants.CardStatusEnum; import com.bonus.canteen.core.account.constants.CardStatusEnum;
import com.bonus.canteen.core.account.domain.AccCard; import com.bonus.canteen.core.account.domain.AccountCard;
import com.bonus.canteen.core.account.service.IAccCardService; import com.bonus.canteen.core.account.service.IAccCardService;
import com.bonus.common.core.utils.poi.ExcelUtil; import com.bonus.common.core.utils.poi.ExcelUtil;
import com.bonus.common.core.web.controller.BaseController; import com.bonus.common.core.web.controller.BaseController;
@ -37,9 +37,9 @@ public class AccCardController extends BaseController {
@ApiOperation(value = "查询人员卡片资料列表") @ApiOperation(value = "查询人员卡片资料列表")
//@RequiresPermissions("account:card:list") //@RequiresPermissions("account:card:list")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(AccCard accCard) { public TableDataInfo list(AccountCard accountCard) {
startPage(); startPage();
List<AccCard> list = accCardService.selectAccCardList(accCard); List<AccountCard> list = accCardService.selectAccCardList(accountCard);
return getDataTable(list); return getDataTable(list);
} }
@ -51,9 +51,9 @@ public class AccCardController extends BaseController {
//@RequiresPermissions("account:card:export") //@RequiresPermissions("account:card:export")
@SysLog(title = "人员卡片资料", businessType = OperaType.EXPORT, logType = 1,module = "仓储管理->导出人员卡片资料") @SysLog(title = "人员卡片资料", businessType = OperaType.EXPORT, logType = 1,module = "仓储管理->导出人员卡片资料")
@PostMapping("/export") @PostMapping("/export")
public void export(HttpServletResponse response, AccCard accCard) { public void export(HttpServletResponse response, AccountCard accountCard) {
List<AccCard> list = accCardService.selectAccCardList(accCard); List<AccountCard> list = accCardService.selectAccCardList(accountCard);
ExcelUtil<AccCard> util = new ExcelUtil<AccCard>(AccCard.class); ExcelUtil<AccountCard> util = new ExcelUtil<AccountCard>(AccountCard.class);
util.exportExcel(response, list, "人员卡片资料数据"); util.exportExcel(response, list, "人员卡片资料数据");
} }
@ -75,10 +75,10 @@ public class AccCardController extends BaseController {
//@RequiresPermissions("account:card:add") //@RequiresPermissions("account:card:add")
@SysLog(title = "人员卡片资料", businessType = OperaType.INSERT, logType = 1,module = "仓储管理->新增人员卡片资料") @SysLog(title = "人员卡片资料", businessType = OperaType.INSERT, logType = 1,module = "仓储管理->新增人员卡片资料")
@PostMapping @PostMapping
public AjaxResult add(@RequestBody AccCard accCard) { public AjaxResult add(@RequestBody AccountCard accountCard) {
try { try {
accCard.setOperationType(CardRecordTypeEnum.APPLY.getKey()); accountCard.setOperationType(CardRecordTypeEnum.APPLY.getKey());
return toAjax(accCardService.insertAccCard(accCard)); return toAjax(accCardService.insertAccCard(accountCard));
} catch (Exception e) { } catch (Exception e) {
return error(e.getMessage()); return error(e.getMessage());
} }
@ -92,9 +92,9 @@ public class AccCardController extends BaseController {
//@RequiresPermissions("account:card:edit") //@RequiresPermissions("account:card:edit")
@SysLog(title = "人员卡片资料", businessType = OperaType.UPDATE, logType = 1,module = "仓储管理->修改人员卡片资料") @SysLog(title = "人员卡片资料", businessType = OperaType.UPDATE, logType = 1,module = "仓储管理->修改人员卡片资料")
@PostMapping("/edit") @PostMapping("/edit")
public AjaxResult edit(@RequestBody AccCard accCard) { public AjaxResult edit(@RequestBody AccountCard accountCard) {
try { try {
return toAjax(accCardService.updateAccCard(accCard)); return toAjax(accCardService.updateAccCard(accountCard));
} catch (Exception e) { } catch (Exception e) {
return error(e.getMessage()); return error(e.getMessage());
} }
@ -105,10 +105,10 @@ public class AccCardController extends BaseController {
//@RequiresPermissions("account:card:edit") //@RequiresPermissions("account:card:edit")
@SysLog(title = "人员卡片资料", businessType = OperaType.UPDATE, logType = 1,module = "仓储管理->换卡") @SysLog(title = "人员卡片资料", businessType = OperaType.UPDATE, logType = 1,module = "仓储管理->换卡")
@PostMapping("/change") @PostMapping("/change")
public AjaxResult change(@RequestBody AccCard accCard) { public AjaxResult change(@RequestBody AccountCard accountCard) {
try { try {
accCard.setOperationType(CardRecordTypeEnum.CHANGE.getKey()); accountCard.setOperationType(CardRecordTypeEnum.CHANGE.getKey());
return toAjax(accCardService.updateAccCard(accCard)); return toAjax(accCardService.updateAccCard(accountCard));
} catch (Exception e) { } catch (Exception e) {
return error(e.getMessage()); return error(e.getMessage());
} }
@ -119,11 +119,11 @@ public class AccCardController extends BaseController {
//@RequiresPermissions("account:card:edit") //@RequiresPermissions("account:card:edit")
@SysLog(title = "人员卡片资料", businessType = OperaType.UPDATE, logType = 1,module = "仓储管理->挂失") @SysLog(title = "人员卡片资料", businessType = OperaType.UPDATE, logType = 1,module = "仓储管理->挂失")
@PostMapping("/loss") @PostMapping("/loss")
public AjaxResult loss(@RequestBody AccCard accCard) { public AjaxResult loss(@RequestBody AccountCard accountCard) {
try { try {
//accCard.setOperationType(CardRecordTypeEnum.LOSS.getKey()); //accCard.setOperationType(CardRecordTypeEnum.LOSS.getKey());
accCard.setCardStatus(CardStatusEnum.LOSS.getKey()); accountCard.setCardStatus(CardStatusEnum.LOSS.getKey());
return toAjax(accCardService.updateAccCard(accCard)); return toAjax(accCardService.updateAccCard(accountCard));
} catch (Exception e) { } catch (Exception e) {
return error(e.getMessage()); return error(e.getMessage());
} }
@ -134,11 +134,11 @@ public class AccCardController extends BaseController {
//@RequiresPermissions("account:card:edit") //@RequiresPermissions("account:card:edit")
@SysLog(title = "人员卡片资料", businessType = OperaType.UPDATE, logType = 1,module = "仓储管理->解挂") @SysLog(title = "人员卡片资料", businessType = OperaType.UPDATE, logType = 1,module = "仓储管理->解挂")
@PostMapping("/relieve") @PostMapping("/relieve")
public AjaxResult relieve(@RequestBody AccCard accCard) { public AjaxResult relieve(@RequestBody AccountCard accountCard) {
try { try {
//accCard.setOperationType(CardRecordTypeEnum.RELIEVE.getKey()); //accCard.setOperationType(CardRecordTypeEnum.RELIEVE.getKey());
accCard.setCardStatus(CardStatusEnum.NORMAL.getKey()); accountCard.setCardStatus(CardStatusEnum.NORMAL.getKey());
return toAjax(accCardService.updateAccCard(accCard)); return toAjax(accCardService.updateAccCard(accountCard));
} catch (Exception e) { } catch (Exception e) {
return error(e.getMessage()); return error(e.getMessage());
} }
@ -149,11 +149,11 @@ public class AccCardController extends BaseController {
//@RequiresPermissions("account:card:edit") //@RequiresPermissions("account:card:edit")
@SysLog(title = "人员卡片资料", businessType = OperaType.UPDATE, logType = 1,module = "仓储管理->退卡") @SysLog(title = "人员卡片资料", businessType = OperaType.UPDATE, logType = 1,module = "仓储管理->退卡")
@PostMapping("/refund") @PostMapping("/refund")
public AjaxResult refund(@RequestBody AccCard accCard) { public AjaxResult refund(@RequestBody AccountCard accountCard) {
try { try {
accCard.setOperationType(CardRecordTypeEnum.REFUND.getKey()); accountCard.setOperationType(CardRecordTypeEnum.REFUND.getKey());
accCard.setCardStatus(CardStatusEnum.REFUND.getKey()); accountCard.setCardStatus(CardStatusEnum.REFUND.getKey());
return toAjax(accCardService.updateAccCard(accCard)); return toAjax(accCardService.updateAccCard(accountCard));
} catch (Exception e) { } catch (Exception e) {
return error(e.getMessage()); return error(e.getMessage());
} }

20
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/controller/AccTradeController.java
View File

@ -1,6 +1,6 @@
package com.bonus.canteen.core.account.controller; package com.bonus.canteen.core.account.controller;
import com.bonus.canteen.core.account.domain.AccTrade; import com.bonus.canteen.core.account.domain.AccountTrade;
import com.bonus.canteen.core.account.domain.param.AccConsumeDetailQueryParam; import com.bonus.canteen.core.account.domain.param.AccConsumeDetailQueryParam;
import com.bonus.canteen.core.account.service.IAccTradeService; import com.bonus.canteen.core.account.service.IAccTradeService;
import com.bonus.common.core.utils.poi.ExcelUtil; import com.bonus.common.core.utils.poi.ExcelUtil;
@ -36,9 +36,9 @@ public class AccTradeController extends BaseController {
@ApiOperation(value = "查询账户交易记录列表") @ApiOperation(value = "查询账户交易记录列表")
//@RequiresPermissions("account:trade:list") //@RequiresPermissions("account:trade:list")
@GetMapping("/list") @GetMapping("/list")
public TableDataInfo list(AccTrade accTrade) { public TableDataInfo list(AccountTrade accountTrade) {
startPage(); startPage();
List<AccTrade> list = accTradeService.selectAccTradeList(accTrade); List<AccountTrade> list = accTradeService.selectAccTradeList(accountTrade);
return getDataTable(list); return getDataTable(list);
} }
@ -50,9 +50,9 @@ public class AccTradeController extends BaseController {
//@RequiresPermissions("account:trade:export") //@RequiresPermissions("account:trade:export")
@SysLog(title = "账户交易记录", businessType = OperaType.EXPORT, logType = 1,module = "仓储管理->导出账户交易记录") @SysLog(title = "账户交易记录", businessType = OperaType.EXPORT, logType = 1,module = "仓储管理->导出账户交易记录")
@PostMapping("/export") @PostMapping("/export")
public void export(HttpServletResponse response, AccTrade accTrade) { public void export(HttpServletResponse response, AccountTrade accountTrade) {
List<AccTrade> list = accTradeService.selectAccTradeList(accTrade); List<AccountTrade> list = accTradeService.selectAccTradeList(accountTrade);
ExcelUtil<AccTrade> util = new ExcelUtil<AccTrade>(AccTrade.class); ExcelUtil<AccountTrade> util = new ExcelUtil<AccountTrade>(AccountTrade.class);
util.exportExcel(response, list, "账户交易记录数据"); util.exportExcel(response, list, "账户交易记录数据");
} }
@ -74,9 +74,9 @@ public class AccTradeController extends BaseController {
//@RequiresPermissions("account:trade:add") //@RequiresPermissions("account:trade:add")
@SysLog(title = "账户交易记录", businessType = OperaType.INSERT, logType = 1,module = "仓储管理->新增账户交易记录") @SysLog(title = "账户交易记录", businessType = OperaType.INSERT, logType = 1,module = "仓储管理->新增账户交易记录")
@PostMapping @PostMapping
public AjaxResult add(@RequestBody AccTrade accTrade) { public AjaxResult add(@RequestBody AccountTrade accountTrade) {
try { try {
return toAjax(accTradeService.insertAccTrade(accTrade)); return toAjax(accTradeService.insertAccTrade(accountTrade));
} catch (Exception e) { } catch (Exception e) {
return error("系统错误, " + e.getMessage()); return error("系统错误, " + e.getMessage());
} }
@ -90,9 +90,9 @@ public class AccTradeController extends BaseController {
//@RequiresPermissions("account:trade:edit") //@RequiresPermissions("account:trade:edit")
@SysLog(title = "账户交易记录", businessType = OperaType.UPDATE, logType = 1,module = "仓储管理->修改账户交易记录") @SysLog(title = "账户交易记录", businessType = OperaType.UPDATE, logType = 1,module = "仓储管理->修改账户交易记录")
@PostMapping("/edit") @PostMapping("/edit")
public AjaxResult edit(@RequestBody AccTrade accTrade) { public AjaxResult edit(@RequestBody AccountTrade accountTrade) {
try { try {
return toAjax(accTradeService.updateAccTrade(accTrade)); return toAjax(accTradeService.updateAccTrade(accountTrade));
} catch (Exception e) { } catch (Exception e) {
return error("系统错误, " + e.getMessage()); return error("系统错误, " + e.getMessage());
} }

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/AccCard.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/AccountCard.java
View File

@ -19,7 +19,7 @@ import java.util.Date;
@Data @Data
@ToString @ToString
public class AccCard extends BaseEntity { public class AccountCard extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** 主键自增 */ /** 主键自增 */

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/AccTrade.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/AccountTrade.java
View File

@ -20,7 +20,7 @@ import java.time.LocalDateTime;
@Data @Data
@ToString @ToString
public class AccTrade extends BaseEntity { public class AccountTrade extends BaseEntity {
private static final long serialVersionUID = 1L; private static final long serialVersionUID = 1L;
/** 交易id */ /** 交易id */

2
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/param/AccountInfoQueryParam.java
View File

@ -12,7 +12,7 @@ public class AccountInfoQueryParam extends BaseEntity {
// @ApiModelProperty("用户编号集合") // @ApiModelProperty("用户编号集合")
// private List<Long> userIds; // private List<Long> userIds;
@ApiModelProperty("账户状态 1正常 2停用") @ApiModelProperty("账户状态 1正常 2停用")
private List<Integer> accStatusList; private List<Integer> accountStatusList;
@ApiModelProperty("筛选钱包类型 0-账户总余额 1-个人钱包 2-补贴钱包") @ApiModelProperty("筛选钱包类型 0-账户总余额 1-个人钱包 2-补贴钱包")
private Integer walletType; private Integer walletType;
@ApiModelProperty("查询组织id集合") @ApiModelProperty("查询组织id集合")

16
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/mapper/AccCardMapper.java
View File

@ -1,6 +1,6 @@
package com.bonus.canteen.core.account.mapper; package com.bonus.canteen.core.account.mapper;
import com.bonus.canteen.core.account.domain.AccCard; import com.bonus.canteen.core.account.domain.AccountCard;
import java.util.List; import java.util.List;
@ -22,31 +22,31 @@ public interface AccCardMapper {
* @param id 人员卡片资料主键 * @param id 人员卡片资料主键
* @return 人员卡片资料 * @return 人员卡片资料
*/ */
public AccCard selectAccCardById(Long id); public AccountCard selectAccCardById(Long id);
/** /**
* 查询人员卡片资料列表 * 查询人员卡片资料列表
* *
* @param accCard 人员卡片资料 * @param accountCard 人员卡片资料
* @return 人员卡片资料集合 * @return 人员卡片资料集合
*/ */
public List<AccCard> selectAccCardList(AccCard accCard); public List<AccountCard> selectAccCardList(AccountCard accountCard);
/** /**
* 新增人员卡片资料 * 新增人员卡片资料
* *
* @param accCard 人员卡片资料 * @param accountCard 人员卡片资料
* @return 结果 * @return 结果
*/ */
public int insertAccCard(AccCard accCard); public int insertAccCard(AccountCard accountCard);
/** /**
* 修改人员卡片资料 * 修改人员卡片资料
* *
* @param accCard 人员卡片资料 * @param accountCard 人员卡片资料
* @return 结果 * @return 结果
*/ */
public int updateAccCard(AccCard accCard); public int updateAccCard(AccountCard accountCard);
/** /**
* 删除人员卡片资料 * 删除人员卡片资料

18
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/mapper/AccTradeMapper.java
View File

@ -1,6 +1,6 @@
package com.bonus.canteen.core.account.mapper; package com.bonus.canteen.core.account.mapper;
import com.bonus.canteen.core.account.domain.AccTrade; import com.bonus.canteen.core.account.domain.AccountTrade;
import com.bonus.canteen.core.account.domain.bo.TradeAndWallerInfo; import com.bonus.canteen.core.account.domain.bo.TradeAndWallerInfo;
import com.bonus.canteen.core.account.domain.param.AccConsumeDetailQueryParam; import com.bonus.canteen.core.account.domain.param.AccConsumeDetailQueryParam;
import com.bonus.canteen.core.account.domain.param.AccWalletOperationQueryParam; import com.bonus.canteen.core.account.domain.param.AccWalletOperationQueryParam;
@ -24,35 +24,35 @@ public interface AccTradeMapper {
* @param tradeId 账户交易记录主键 * @param tradeId 账户交易记录主键
* @return 账户交易记录 * @return 账户交易记录
*/ */
public AccTrade selectAccTradeByTradeId(Long tradeId); public AccountTrade selectAccTradeByTradeId(Long tradeId);
public List<AccTrade> selectAccTradeByOrderNo(Long orderNo); public List<AccountTrade> selectAccTradeByOrderNo(Long orderNo);
/** /**
* 查询账户交易记录列表 * 查询账户交易记录列表
* *
* @param accTrade 账户交易记录 * @param accountTrade 账户交易记录
* @return 账户交易记录集合 * @return 账户交易记录集合
*/ */
public List<AccTrade> selectAccTradeList(AccTrade accTrade); public List<AccountTrade> selectAccTradeList(AccountTrade accountTrade);
/** /**
* 新增账户交易记录 * 新增账户交易记录
* *
* @param accTrade 账户交易记录 * @param accountTrade 账户交易记录
* @return 结果 * @return 结果
*/ */
public int insertAccTrade(AccTrade accTrade); public int insertAccTrade(AccountTrade accountTrade);
// public int insertAccTradeVo(AccTradeVo accTrade); // public int insertAccTradeVo(AccTradeVo accTrade);
/** /**
* 修改账户交易记录 * 修改账户交易记录
* *
* @param accTrade 账户交易记录 * @param accountTrade 账户交易记录
* @return 结果 * @return 结果
*/ */
public int updateAccTrade(AccTrade accTrade); public int updateAccTrade(AccountTrade accountTrade);
public int updateAccTradeVoByOrderNo(AccTradeVo accTradeVo); public int updateAccTradeVoByOrderNo(AccTradeVo accTradeVo);

16
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/IAccCardService.java
View File

@ -1,6 +1,6 @@
package com.bonus.canteen.core.account.service; package com.bonus.canteen.core.account.service;
import com.bonus.canteen.core.account.domain.AccCard; import com.bonus.canteen.core.account.domain.AccountCard;
import java.util.List; import java.util.List;
@ -17,31 +17,31 @@ public interface IAccCardService {
* @param id 人员卡片资料主键 * @param id 人员卡片资料主键
* @return 人员卡片资料 * @return 人员卡片资料
*/ */
public AccCard selectAccCardById(Long id); public AccountCard selectAccCardById(Long id);
/** /**
* 查询人员卡片资料列表 * 查询人员卡片资料列表
* *
* @param accCard 人员卡片资料 * @param accountCard 人员卡片资料
* @return 人员卡片资料集合 * @return 人员卡片资料集合
*/ */
public List<AccCard> selectAccCardList(AccCard accCard); public List<AccountCard> selectAccCardList(AccountCard accountCard);
/** /**
* 新增人员卡片资料 * 新增人员卡片资料
* *
* @param accCard 人员卡片资料 * @param accountCard 人员卡片资料
* @return 结果 * @return 结果
*/ */
public int insertAccCard(AccCard accCard); public int insertAccCard(AccountCard accountCard);
/** /**
* 修改人员卡片资料 * 修改人员卡片资料
* *
* @param accCard 人员卡片资料 * @param accountCard 人员卡片资料
* @return 结果 * @return 结果
*/ */
public int updateAccCard(AccCard accCard); public int updateAccCard(AccountCard accountCard);
/** /**
* 批量删除人员卡片资料 * 批量删除人员卡片资料

18
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/IAccTradeService.java
View File

@ -1,7 +1,7 @@
package com.bonus.canteen.core.account.service; package com.bonus.canteen.core.account.service;
import com.bonus.canteen.core.account.constants.AccTradeTypeEnum; import com.bonus.canteen.core.account.constants.AccTradeTypeEnum;
import com.bonus.canteen.core.account.domain.AccTrade; import com.bonus.canteen.core.account.domain.AccountTrade;
import com.bonus.canteen.core.account.domain.bo.TradeAndWallerInfo; import com.bonus.canteen.core.account.domain.bo.TradeAndWallerInfo;
import com.bonus.canteen.core.account.domain.param.AccConsumeDetailQueryParam; import com.bonus.canteen.core.account.domain.param.AccConsumeDetailQueryParam;
import com.bonus.canteen.core.account.domain.param.AccWalletOperationQueryParam; import com.bonus.canteen.core.account.domain.param.AccWalletOperationQueryParam;
@ -24,35 +24,35 @@ public interface IAccTradeService {
* @param tradeId 账户交易记录主键 * @param tradeId 账户交易记录主键
* @return 账户交易记录 * @return 账户交易记录
*/ */
public AccTrade selectAccTradeByTradeId(Long tradeId); public AccountTrade selectAccTradeByTradeId(Long tradeId);
public List<AccTrade> selectAccTradeByOrderNo(Long orderNo); public List<AccountTrade> selectAccTradeByOrderNo(Long orderNo);
/** /**
* 查询账户交易记录列表 * 查询账户交易记录列表
* *
* @param accTrade 账户交易记录 * @param accountTrade 账户交易记录
* @return 账户交易记录集合 * @return 账户交易记录集合
*/ */
public List<AccTrade> selectAccTradeList(AccTrade accTrade); public List<AccountTrade> selectAccTradeList(AccountTrade accountTrade);
/** /**
* 新增账户交易记录 * 新增账户交易记录
* *
* @param accTrade 账户交易记录 * @param accountTrade 账户交易记录
* @return 结果 * @return 结果
*/ */
public int insertAccTrade(AccTrade accTrade); public int insertAccTrade(AccountTrade accountTrade);
public int insertAccTradeVo(AccTradeVo accTrade); public int insertAccTradeVo(AccTradeVo accTrade);
/** /**
* 修改账户交易记录 * 修改账户交易记录
* *
* @param accTrade 账户交易记录 * @param accountTrade 账户交易记录
* @return 结果 * @return 结果
*/ */
public int updateAccTrade(AccTrade accTrade); public int updateAccTrade(AccountTrade accountTrade);
public int updateAccTradeVoByOrderNo(AccTradeVo accTrade); public int updateAccTradeVoByOrderNo(AccTradeVo accTrade);

82
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccCardServiceImpl.java
View File

@ -5,7 +5,7 @@ import com.bonus.canteen.core.account.constants.AccStatusEnum;
import com.bonus.canteen.core.account.constants.CardRecordTypeEnum; import com.bonus.canteen.core.account.constants.CardRecordTypeEnum;
import com.bonus.canteen.core.account.constants.CardStatusEnum; import com.bonus.canteen.core.account.constants.CardStatusEnum;
import com.bonus.canteen.core.account.constants.CardTypeEnum; import com.bonus.canteen.core.account.constants.CardTypeEnum;
import com.bonus.canteen.core.account.domain.AccCard; import com.bonus.canteen.core.account.domain.AccountCard;
import com.bonus.canteen.core.account.domain.AccCardHis; import com.bonus.canteen.core.account.domain.AccCardHis;
import com.bonus.canteen.core.account.domain.AccountInfo; import com.bonus.canteen.core.account.domain.AccountInfo;
import com.bonus.canteen.core.account.mapper.AccCardHisMapper; import com.bonus.canteen.core.account.mapper.AccCardHisMapper;
@ -42,70 +42,70 @@ public class AccCardServiceImpl implements IAccCardService {
* @return 人员卡片资料 * @return 人员卡片资料
*/ */
@Override @Override
public AccCard selectAccCardById(Long id) { public AccountCard selectAccCardById(Long id) {
return accCardMapper.selectAccCardById(id); return accCardMapper.selectAccCardById(id);
} }
/** /**
* 查询人员卡片资料列表 * 查询人员卡片资料列表
* *
* @param accCard 人员卡片资料 * @param accountCard 人员卡片资料
* @return 人员卡片资料 * @return 人员卡片资料
*/ */
@Override @Override
public List<AccCard> selectAccCardList(AccCard accCard) { public List<AccountCard> selectAccCardList(AccountCard accountCard) {
return accCardMapper.selectAccCardList(accCard); return accCardMapper.selectAccCardList(accountCard);
} }
/** /**
* 新增人员卡片资料 * 新增人员卡片资料
* *
* @param accCard 人员卡片资料 * @param accountCard 人员卡片资料
* @return 结果 * @return 结果
*/ */
@Override @Override
public int insertAccCard(AccCard accCard) { public int insertAccCard(AccountCard accountCard) {
accCard.setCreateBy(SecurityUtils.getUsername()); accountCard.setCreateBy(SecurityUtils.getUsername());
accCard.setCreateTime(DateUtils.getNowDate()); accountCard.setCreateTime(DateUtils.getNowDate());
try { try {
AccountInfo accountInfo = accInfoMapper.selectAccInfoById(accCard.getAccountId()); AccountInfo accountInfo = accInfoMapper.selectAccInfoById(accountCard.getAccountId());
checkAccInfoAndStatus(accountInfo); checkAccInfoAndStatus(accountInfo);
accCard.setUserId(accountInfo.getUserId()); accountCard.setUserId(accountInfo.getUserId());
accCard.setCardStatus(CardStatusEnum.NORMAL.getKey()); accountCard.setCardStatus(CardStatusEnum.NORMAL.getKey());
accCard.setCardType(CardTypeEnum.IC_CARD.getKey()); accountCard.setCardType(CardTypeEnum.IC_CARD.getKey());
// 发卡前校验是否此用户已有卡, 已退卡、已过期的可以再发放 // 发卡前校验是否此用户已有卡, 已退卡、已过期的可以再发放
int cardCountByUserId= accCardMapper.selectAccCardCountByUserId(accountInfo.getUserId()); int cardCountByUserId= accCardMapper.selectAccCardCountByUserId(accountInfo.getUserId());
if (cardCountByUserId > 0) { if (cardCountByUserId > 0) {
throw new ServiceException("此用户已有卡, 不能再次发放"); throw new ServiceException("此用户已有卡, 不能再次发放");
} }
// 发卡前校验是否卡号已存在, 卡号不能重复 // 发卡前校验是否卡号已存在, 卡号不能重复
int cardCountByCardSerialNum= accCardMapper.selectAccCardCountByCardSerialNum(accCard.getSerialNum()); int cardCountByCardSerialNum= accCardMapper.selectAccCardCountByCardSerialNum(accountCard.getSerialNum());
if (cardCountByCardSerialNum > 0) { if (cardCountByCardSerialNum > 0) {
throw new ServiceException("卡号已存在, 卡号不能重复"); throw new ServiceException("卡号已存在, 卡号不能重复");
} }
int count = accCardMapper.insertAccCard(accCard); int count = accCardMapper.insertAccCard(accountCard);
saveAccCardChangeRecord(accCard); saveAccCardChangeRecord(accountCard);
return count; return count;
} catch (Exception e) { } catch (Exception e) {
throw new ServiceException(e.getMessage()); throw new ServiceException(e.getMessage());
} }
} }
private void saveAccCardChangeRecord(AccCard accCard) { private void saveAccCardChangeRecord(AccountCard accountCard) {
AccCardHis accCardHis = new AccCardHis(); AccCardHis accCardHis = new AccCardHis();
accCardHis.setCreateBy(SecurityUtils.getUsername()); accCardHis.setCreateBy(SecurityUtils.getUsername());
accCardHis.setCreateTime(DateUtils.getNowDate()); accCardHis.setCreateTime(DateUtils.getNowDate());
accCardHis.setUserId(accCard.getUserId()); accCardHis.setUserId(accountCard.getUserId());
accCardHis.setAccountId(accCard.getAccountId()); accCardHis.setAccountId(accountCard.getAccountId());
accCardHis.setSerialNum(accCard.getSerialNum()); accCardHis.setSerialNum(accountCard.getSerialNum());
accCardHis.setCardType(CardTypeEnum.IC_CARD.getKey()); accCardHis.setCardType(CardTypeEnum.IC_CARD.getKey());
accCardHis.setRecordType(accCard.getOperationType()); accCardHis.setRecordType(accountCard.getOperationType());
accCardHis.setRemark(accCard.getRemark()); accCardHis.setRemark(accountCard.getRemark());
if (CardRecordTypeEnum.APPLY.getKey().equals(accCard.getOperationType())) { if (CardRecordTypeEnum.APPLY.getKey().equals(accountCard.getOperationType())) {
accCardHis.setDeposit(accCard.getDeposit()); accCardHis.setDeposit(accountCard.getDeposit());
accCardHis.setProductCost(accCard.getProductCost()); accCardHis.setProductCost(accountCard.getProductCost());
} else if (CardRecordTypeEnum.CHANGE.getKey().equals(accCard.getOperationType())) { } else if (CardRecordTypeEnum.CHANGE.getKey().equals(accountCard.getOperationType())) {
accCardHis.setProductCost(accCard.getProductCost()); accCardHis.setProductCost(accountCard.getProductCost());
} }
accCardHisMapper.insertAccCardHis(accCardHis); accCardHisMapper.insertAccCardHis(accCardHis);
} }
@ -121,29 +121,29 @@ public class AccCardServiceImpl implements IAccCardService {
/** /**
* 修改人员卡片资料 * 修改人员卡片资料
* *
* @param accCard 人员卡片资料 * @param accountCard 人员卡片资料
* @return 结果 * @return 结果
*/ */
@Override @Override
public int updateAccCard(AccCard accCard) { public int updateAccCard(AccountCard accountCard) {
accCard.setUpdateBy(SecurityUtils.getUsername()); accountCard.setUpdateBy(SecurityUtils.getUsername());
accCard.setUpdateTime(DateUtils.getNowDate()); accountCard.setUpdateTime(DateUtils.getNowDate());
try { try {
// 发卡前校验是否卡号已存在, 卡号不能重复 // 发卡前校验是否卡号已存在, 卡号不能重复
int cardCountByCardSerialNum= accCardMapper.selectAccCardCountByCardSerialNum(accCard.getSerialNum()); int cardCountByCardSerialNum= accCardMapper.selectAccCardCountByCardSerialNum(accountCard.getSerialNum());
if (cardCountByCardSerialNum > 0) { if (cardCountByCardSerialNum > 0) {
throw new ServiceException("卡号已存在, 卡号不能重复"); throw new ServiceException("卡号已存在, 卡号不能重复");
} }
AccountInfo accountInfo = accInfoMapper.selectAccInfoById(accCard.getAccountId()); AccountInfo accountInfo = accInfoMapper.selectAccInfoById(accountCard.getAccountId());
checkAccInfoAndStatus(accountInfo); checkAccInfoAndStatus(accountInfo);
int count = accCardMapper.updateAccCard(accCard); int count = accCardMapper.updateAccCard(accountCard);
accCard.setUserId(accountInfo.getUserId()); accountCard.setUserId(accountInfo.getUserId());
if (CardRecordTypeEnum.CHANGE.getKey().equals(accCard.getOperationType())) { if (CardRecordTypeEnum.CHANGE.getKey().equals(accountCard.getOperationType())) {
accCard.setCardStatus(CardStatusEnum.NORMAL.getKey()); accountCard.setCardStatus(CardStatusEnum.NORMAL.getKey());
saveAccCardChangeRecord(accCard); saveAccCardChangeRecord(accountCard);
} else if (CardRecordTypeEnum.REFUND.getKey().equals(accCard.getOperationType())) { } else if (CardRecordTypeEnum.REFUND.getKey().equals(accountCard.getOperationType())) {
accCard.setCardStatus(CardStatusEnum.REFUND.getKey()); accountCard.setCardStatus(CardStatusEnum.REFUND.getKey());
saveAccCardChangeRecord(accCard); saveAccCardChangeRecord(accountCard);
} }
return count; return count;
} catch (Exception e) { } catch (Exception e) {

8
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccInfoServiceImpl.java
View File

@ -96,8 +96,8 @@ public class AccInfoServiceImpl implements IAccInfoService {
@Override @Override
public List<AccInfoDetailsVO> selectAccInfoList(AccountInfoQueryParam accountInfoQueryParam) { public List<AccInfoDetailsVO> selectAccInfoList(AccountInfoQueryParam accountInfoQueryParam) {
String encryptedSearchValue = SM4EncryptUtils.sm4Encrypt(accountInfoQueryParam.getSearchValue()); String encryptedSearchValue = SM4EncryptUtils.sm4Encrypt(accountInfoQueryParam.getSearchValue());
if(CollUtil.isEmpty(accountInfoQueryParam.getAccStatusList())) { if(CollUtil.isEmpty(accountInfoQueryParam.getAccountStatusList())) {
accountInfoQueryParam.setAccStatusList(AccStatusEnum.getAllKeys()); accountInfoQueryParam.setAccountStatusList(AccStatusEnum.getAllKeys());
} }
List<AccInfoDetailsVO> list = accInfoMapper.queryAccInfoDetails(accountInfoQueryParam, encryptedSearchValue); List<AccInfoDetailsVO> list = accInfoMapper.queryAccInfoDetails(accountInfoQueryParam, encryptedSearchValue);
handleResult(list); handleResult(list);
@ -306,8 +306,8 @@ public class AccInfoServiceImpl implements IAccInfoService {
public AccInfoDetailsVO queryAccInfoBalanceSum(AccountInfoQueryParam accountInfoQueryParam) { public AccInfoDetailsVO queryAccInfoBalanceSum(AccountInfoQueryParam accountInfoQueryParam) {
String encryptedSearchValue = SM4EncryptUtils.sm4Encrypt(accountInfoQueryParam.getSearchValue()); String encryptedSearchValue = SM4EncryptUtils.sm4Encrypt(accountInfoQueryParam.getSearchValue());
if(CollUtil.isEmpty(accountInfoQueryParam.getAccStatusList())) { if(CollUtil.isEmpty(accountInfoQueryParam.getAccountStatusList())) {
accountInfoQueryParam.setAccStatusList(AccStatusEnum.getAllKeys()); accountInfoQueryParam.setAccountStatusList(AccStatusEnum.getAllKeys());
} }
return accInfoMapper.queryAccInfoBalanceSum(accountInfoQueryParam, encryptedSearchValue); return accInfoMapper.queryAccInfoBalanceSum(accountInfoQueryParam, encryptedSearchValue);
} }

36
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccTradeServiceImpl.java
View File

@ -2,7 +2,7 @@ package com.bonus.canteen.core.account.service.impl;
import cn.hutool.core.collection.CollUtil; import cn.hutool.core.collection.CollUtil;
import com.bonus.canteen.core.account.constants.AccTradeTypeEnum; import com.bonus.canteen.core.account.constants.AccTradeTypeEnum;
import com.bonus.canteen.core.account.domain.AccTrade; import com.bonus.canteen.core.account.domain.AccountTrade;
import com.bonus.canteen.core.account.domain.bo.TradeAndWallerInfo; import com.bonus.canteen.core.account.domain.bo.TradeAndWallerInfo;
import com.bonus.canteen.core.account.domain.param.AccConsumeDetailQueryParam; import com.bonus.canteen.core.account.domain.param.AccConsumeDetailQueryParam;
import com.bonus.canteen.core.account.domain.param.AccWalletOperationQueryParam; import com.bonus.canteen.core.account.domain.param.AccWalletOperationQueryParam;
@ -40,47 +40,47 @@ public class AccTradeServiceImpl implements IAccTradeService {
* @return 账户交易记录 * @return 账户交易记录
*/ */
@Override @Override
public AccTrade selectAccTradeByTradeId(Long tradeId) { public AccountTrade selectAccTradeByTradeId(Long tradeId) {
return accTradeMapper.selectAccTradeByTradeId(tradeId); return accTradeMapper.selectAccTradeByTradeId(tradeId);
} }
@Override @Override
public List<AccTrade> selectAccTradeByOrderNo(Long orderNo) { public List<AccountTrade> selectAccTradeByOrderNo(Long orderNo) {
return accTradeMapper.selectAccTradeByOrderNo(orderNo); return accTradeMapper.selectAccTradeByOrderNo(orderNo);
} }
/** /**
* 查询账户交易记录列表 * 查询账户交易记录列表
* *
* @param accTrade 账户交易记录 * @param accountTrade 账户交易记录
* @return 账户交易记录 * @return 账户交易记录
*/ */
@Override @Override
public List<AccTrade> selectAccTradeList(AccTrade accTrade) { public List<AccountTrade> selectAccTradeList(AccountTrade accountTrade) {
return accTradeMapper.selectAccTradeList(accTrade); return accTradeMapper.selectAccTradeList(accountTrade);
} }
/** /**
* 新增账户交易记录 * 新增账户交易记录
* *
* @param accTrade 账户交易记录 * @param accountTrade 账户交易记录
* @return 结果 * @return 结果
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRES_NEW) @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRES_NEW)
public int insertAccTrade(AccTrade accTrade) { public int insertAccTrade(AccountTrade accountTrade) {
accTrade.setCreateTime(DateUtils.getNowDate()); accountTrade.setCreateTime(DateUtils.getNowDate());
accTrade.setUpdateTime(DateUtils.getNowDate()); accountTrade.setUpdateTime(DateUtils.getNowDate());
return accTradeMapper.insertAccTrade(accTrade); return accTradeMapper.insertAccTrade(accountTrade);
} }
@Override @Override
public int insertAccTradeVo(AccTradeVo accTradeVo) { public int insertAccTradeVo(AccTradeVo accTradeVo) {
accTradeVo.setCreateTime(DateUtils.getNowDate()); accTradeVo.setCreateTime(DateUtils.getNowDate());
try { try {
AccTrade accTrade = new AccTrade(); AccountTrade accountTrade = new AccountTrade();
BeanUtils.copyProperties(accTradeVo, accTrade); BeanUtils.copyProperties(accTradeVo, accountTrade);
return accTradeMapper.insertAccTrade(accTrade); return accTradeMapper.insertAccTrade(accountTrade);
} catch (Exception e) { } catch (Exception e) {
throw new ServiceException("错误信息描述" + e.getMessage()); throw new ServiceException("错误信息描述" + e.getMessage());
} }
@ -89,15 +89,15 @@ public class AccTradeServiceImpl implements IAccTradeService {
/** /**
* 修改账户交易记录 * 修改账户交易记录
* *
* @param accTrade 账户交易记录 * @param accountTrade 账户交易记录
* @return 结果 * @return 结果
*/ */
@Override @Override
@Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRES_NEW) @Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRES_NEW)
public int updateAccTrade(AccTrade accTrade) { public int updateAccTrade(AccountTrade accountTrade) {
accTrade.setUpdateTime(DateUtils.getNowDate()); accountTrade.setUpdateTime(DateUtils.getNowDate());
try { try {
return accTradeMapper.updateAccTrade(accTrade); return accTradeMapper.updateAccTrade(accountTrade);
} catch (Exception e) { } catch (Exception e) {
throw new ServiceException("错误信息描述" + e.getMessage()); throw new ServiceException("错误信息描述" + e.getMessage());
} }

8
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccCardMapper.xml
View File

@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.bonus.canteen.core.account.mapper.AccCardMapper"> <mapper namespace="com.bonus.canteen.core.account.mapper.AccCardMapper">
<resultMap type="com.bonus.canteen.core.account.domain.AccCard" id="AccCardResult"> <resultMap type="com.bonus.canteen.core.account.domain.AccountCard" id="AccCardResult">
<result property="id" column="id" /> <result property="id" column="id" />
<result property="userId" column="user_id" /> <result property="userId" column="user_id" />
<result property="accountId" column="account_id" /> <result property="accountId" column="account_id" />
@ -28,7 +28,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
left join sys_user su on su.user_id = ac.user_id left join sys_user su on su.user_id = ac.user_id
</sql> </sql>
<select id="selectAccCardList" parameterType="com.bonus.canteen.core.account.domain.AccCard" resultMap="AccCardResult"> <select id="selectAccCardList" parameterType="com.bonus.canteen.core.account.domain.AccountCard" resultMap="AccCardResult">
<include refid="selectAccCardVo"/> <include refid="selectAccCardVo"/>
<where> <where>
<if test="userId != null "> and ac.user_id = #{userId}</if> <if test="userId != null "> and ac.user_id = #{userId}</if>
@ -59,7 +59,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where ac.id = #{id} where ac.id = #{id}
</select> </select>
<insert id="insertAccCard" parameterType="com.bonus.canteen.core.account.domain.AccCard" useGeneratedKeys="true" keyProperty="id"> <insert id="insertAccCard" parameterType="com.bonus.canteen.core.account.domain.AccountCard" useGeneratedKeys="true" keyProperty="id">
insert into account_card insert into account_card
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
<if test="userId != null">user_id,</if> <if test="userId != null">user_id,</if>
@ -93,7 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</trim> </trim>
</insert> </insert>
<update id="updateAccCard" parameterType="com.bonus.canteen.core.account.domain.AccCard"> <update id="updateAccCard" parameterType="com.bonus.canteen.core.account.domain.AccountCard">
update account_card update account_card
<trim prefix="SET" suffixOverrides=","> <trim prefix="SET" suffixOverrides=",">
<if test="userId != null">user_id = #{userId},</if> <if test="userId != null">user_id = #{userId},</if>

2
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccInfoMapper.xml
View File

@ -283,7 +283,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<where> <where>
t1.del_flag = 0 t1.del_flag = 0
and t1.account_status in and t1.account_status in
<foreach collection="accountInfoQueryParam.accStatusList" item="accStatus" separator="," open="(" close=")"> <foreach collection="accountInfoQueryParam.accountStatusList" item="accStatus" separator="," open="(" close=")">
#{accStatus} #{accStatus}
</foreach> </foreach>
<if test="accountInfoQueryParam.searchValue != null and accountInfoQueryParam.searchValue != ''"> <if test="accountInfoQueryParam.searchValue != null and accountInfoQueryParam.searchValue != ''">

8
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/account/AccTradeMapper.xml
View File

@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd"> "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.bonus.canteen.core.account.mapper.AccTradeMapper"> <mapper namespace="com.bonus.canteen.core.account.mapper.AccTradeMapper">
<resultMap type="com.bonus.canteen.core.account.domain.AccTrade" id="AccTradeResult"> <resultMap type="com.bonus.canteen.core.account.domain.AccountTrade" id="AccTradeResult">
<result property="tradeId" column="trade_id" /> <result property="tradeId" column="trade_id" />
<result property="tradeTime" column="trade_time" /> <result property="tradeTime" column="trade_time" />
<result property="userId" column="user_id" /> <result property="userId" column="user_id" />
@ -48,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
from account_trade from account_trade
</sql> </sql>
<select id="selectAccTradeList" parameterType="com.bonus.canteen.core.account.domain.AccTrade" resultMap="AccTradeResult"> <select id="selectAccTradeList" parameterType="com.bonus.canteen.core.account.domain.AccountTrade" resultMap="AccTradeResult">
<include refid="selectAccTradeVo"/> <include refid="selectAccTradeVo"/>
<where> <where>
<if test="tradeTime != null "> and trade_time = #{tradeTime}</if> <if test="tradeTime != null "> and trade_time = #{tradeTime}</if>
@ -92,7 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where order_no = #{orderNo} where order_no = #{orderNo}
</select> </select>
<insert id="insertAccTrade" parameterType="com.bonus.canteen.core.account.domain.AccTrade" keyProperty="tradeId" useGeneratedKeys="true"> <insert id="insertAccTrade" parameterType="com.bonus.canteen.core.account.domain.AccountTrade" keyProperty="tradeId" useGeneratedKeys="true">
insert into account_trade insert into account_trade
<trim prefix="(" suffix=")" suffixOverrides=","> <trim prefix="(" suffix=")" suffixOverrides=",">
<if test="tradeId != null">trade_id,</if> <if test="tradeId != null">trade_id,</if>
@ -166,7 +166,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</trim> </trim>
</insert> </insert>
<update id="updateAccTrade" parameterType="com.bonus.canteen.core.account.domain.AccTrade"> <update id="updateAccTrade" parameterType="com.bonus.canteen.core.account.domain.AccountTrade">
update account_trade update account_trade
<trim prefix="SET" suffixOverrides=","> <trim prefix="SET" suffixOverrides=",">
<if test="tradeTime != null">trade_time = #{tradeTime},</if> <if test="tradeTime != null">trade_time = #{tradeTime},</if>