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

Merge remote-tracking branch 'origin/master'

This commit is contained in:
sxu 2025-05-26 18:00:18 +08:00
parent b85adc42d2 ecd11efce1
commit 0d4f3db67f
27 changed files with 286 additions and 250 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.AccTradeTypeEnum;
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.AccWalletInfo;
import com.bonus.canteen.core.account.domain.WalletUpdateDTO;
@ -150,25 +150,25 @@ public class AccWalletInfoBusiness {
accTradeWalletDetail.setCreateBy(StringUtils.isBlank(operation.getOperationUser()) ?
SecurityUtils.getUsername() : operation.getOperationUser());
this.accTradeWalletDetailService.insertAccTradeWalletDetail(accTradeWalletDetail);
AccTrade accTrade = new AccTrade();
accTrade.setTradeId(tradeId);
accTrade.setPayState(PayStateEnum.PAY_SUCC.getKey());
accTrade.setTradeState(AccTradeStateEnum.TAKE_EFFECT.getKey());
accTrade.setUpdateBy(StringUtils.isBlank(operation.getOperationUser()) ?
AccountTrade accountTrade = new AccountTrade();
accountTrade.setTradeId(tradeId);
accountTrade.setPayState(PayStateEnum.PAY_SUCC.getKey());
accountTrade.setTradeState(AccTradeStateEnum.TAKE_EFFECT.getKey());
accountTrade.setUpdateBy(StringUtils.isBlank(operation.getOperationUser()) ?
SecurityUtils.getUsername() : operation.getOperationUser());
accTrade.setWalletBalTotal(walletBalByWalletId);
accTrade.setAccountAllBal(walletBalByWalletId);
accTrade.setMachineSn(operation.getDeviceSn());
this.accTradeService.updateAccTrade(accTrade);
accountTrade.setWalletBalTotal(walletBalByWalletId);
accountTrade.setAccountAllBal(walletBalByWalletId);
accountTrade.setMachineSn(operation.getDeviceSn());
this.accTradeService.updateAccTrade(accountTrade);
}catch (Exception ex) {
if(Objects.nonNull(tradeId)) {
AccTrade accTrade = new AccTrade();
accTrade.setTradeId(tradeId);
accTrade.setPayState(PayStateEnum.PAY_FAIL.getKey());
accTrade.setTradeState(AccTradeStateEnum.CANCELED.getKey());
accTrade.setUpdateBy(SecurityUtils.getUsername());
accTrade.setFailReason(StringUtils.substring(ex.getMessage(), 0, 100));
this.accTradeService.updateAccTrade(accTrade);
AccountTrade accountTrade = new AccountTrade();
accountTrade.setTradeId(tradeId);
accountTrade.setPayState(PayStateEnum.PAY_FAIL.getKey());
accountTrade.setTradeState(AccTradeStateEnum.CANCELED.getKey());
accountTrade.setUpdateBy(SecurityUtils.getUsername());
accountTrade.setFailReason(StringUtils.substring(ex.getMessage(), 0, 100));
this.accTradeService.updateAccTrade(accountTrade);
}
log.error("修改钱包失败", ex);
throw new ServiceException("修改钱包失败");
@ -202,31 +202,31 @@ public class AccWalletInfoBusiness {
sysUser = JSONObject.parseObject(JSON.toJSONString(userResult.get(AjaxResult.DATA_TAG)), SysUser.class);
}
LocalDateTime tradeTime = LocalDateTime.now();
AccTrade accTrade = new AccTrade();
accTrade.setTradeTime(tradeTime);
accTrade.setTradeType(operation.getTradeType());
accTrade.setAmount(operation.getAmount());
accTrade.setActualAmount(operation.getAmount());
accTrade.setWalletBalTotal(accBalTotal);
accTrade.setAccountAllBal(accBalTotal);
accTrade.setPayState(PayStateEnum.PAY_INPROCESS.getKey());
accTrade.setTradeState(AccTradeStateEnum.CREATE.getKey());
accTrade.setUserId(operation.getUserId());
accTrade.setPayChannel(operation.getPayChannel());
accTrade.setPayType(operation.getPayType());
accTrade.setCreateBy(StringUtils.isBlank(operation.getOperationUser()) ?
AccountTrade accountTrade = new AccountTrade();
accountTrade.setTradeTime(tradeTime);
accountTrade.setTradeType(operation.getTradeType());
accountTrade.setAmount(operation.getAmount());
accountTrade.setActualAmount(operation.getAmount());
accountTrade.setWalletBalTotal(accBalTotal);
accountTrade.setAccountAllBal(accBalTotal);
accountTrade.setPayState(PayStateEnum.PAY_INPROCESS.getKey());
accountTrade.setTradeState(AccTradeStateEnum.CREATE.getKey());
accountTrade.setUserId(operation.getUserId());
accountTrade.setPayChannel(operation.getPayChannel());
accountTrade.setPayType(operation.getPayType());
accountTrade.setCreateBy(StringUtils.isBlank(operation.getOperationUser()) ?
SecurityUtils.getUsername() : operation.getOperationUser());
accTrade.setUpdateBy(StringUtils.isBlank(operation.getOperationUser()) ?
accountTrade.setUpdateBy(StringUtils.isBlank(operation.getOperationUser()) ?
SecurityUtils.getUsername() : operation.getOperationUser());
if(Objects.nonNull(sysUser)) {
accTrade.setDeptId(sysUser.getDeptId());
accountTrade.setDeptId(sysUser.getDeptId());
}
if(Objects.nonNull(operation.getOrderNo())) {
accTrade.setOrderNo(operation.getOrderNo());
accountTrade.setOrderNo(operation.getOrderNo());
}
accTrade.setMachineSn(operation.getDeviceSn());
this.accTradeService.insertAccTrade(accTrade);
return accTrade.getTradeId();
accountTrade.setMachineSn(operation.getDeviceSn());
this.accTradeService.insertAccTrade(accountTrade);
return accountTrade.getTradeId();
}
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.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.common.core.utils.poi.ExcelUtil;
import com.bonus.common.core.web.controller.BaseController;
@ -37,9 +37,9 @@ public class AccCardController extends BaseController {
@ApiOperation(value = "查询人员卡片资料列表")
//@RequiresPermissions("account:card:list")
@GetMapping("/list")
public TableDataInfo list(AccCard accCard) {
public TableDataInfo list(AccountCard accountCard) {
startPage();
List<AccCard> list = accCardService.selectAccCardList(accCard);
List<AccountCard> list = accCardService.selectAccCardList(accountCard);
return getDataTable(list);
}
@ -51,9 +51,9 @@ public class AccCardController extends BaseController {
//@RequiresPermissions("account:card:export")
@SysLog(title = "人员卡片资料", businessType = OperaType.EXPORT, logType = 1,module = "仓储管理->导出人员卡片资料")
@PostMapping("/export")
public void export(HttpServletResponse response, AccCard accCard) {
List<AccCard> list = accCardService.selectAccCardList(accCard);
ExcelUtil<AccCard> util = new ExcelUtil<AccCard>(AccCard.class);
public void export(HttpServletResponse response, AccountCard accountCard) {
List<AccountCard> list = accCardService.selectAccCardList(accountCard);
ExcelUtil<AccountCard> util = new ExcelUtil<AccountCard>(AccountCard.class);
util.exportExcel(response, list, "人员卡片资料数据");
}
@ -75,10 +75,10 @@ public class AccCardController extends BaseController {
//@RequiresPermissions("account:card:add")
@SysLog(title = "人员卡片资料", businessType = OperaType.INSERT, logType = 1,module = "仓储管理->新增人员卡片资料")
@PostMapping
public AjaxResult add(@RequestBody AccCard accCard) {
public AjaxResult add(@RequestBody AccountCard accountCard) {
try {
accCard.setOperationType(CardRecordTypeEnum.APPLY.getKey());
return toAjax(accCardService.insertAccCard(accCard));
accountCard.setOperationType(CardRecordTypeEnum.APPLY.getKey());
return toAjax(accCardService.insertAccCard(accountCard));
} catch (Exception e) {
return error(e.getMessage());
}
@ -92,9 +92,9 @@ public class AccCardController extends BaseController {
//@RequiresPermissions("account:card:edit")
@SysLog(title = "人员卡片资料", businessType = OperaType.UPDATE, logType = 1,module = "仓储管理->修改人员卡片资料")
@PostMapping("/edit")
public AjaxResult edit(@RequestBody AccCard accCard) {
public AjaxResult edit(@RequestBody AccountCard accountCard) {
try {
return toAjax(accCardService.updateAccCard(accCard));
return toAjax(accCardService.updateAccCard(accountCard));
} catch (Exception e) {
return error(e.getMessage());
}
@ -105,10 +105,10 @@ public class AccCardController extends BaseController {
//@RequiresPermissions("account:card:edit")
@SysLog(title = "人员卡片资料", businessType = OperaType.UPDATE, logType = 1,module = "仓储管理->换卡")
@PostMapping("/change")
public AjaxResult change(@RequestBody AccCard accCard) {
public AjaxResult change(@RequestBody AccountCard accountCard) {
try {
accCard.setOperationType(CardRecordTypeEnum.CHANGE.getKey());
return toAjax(accCardService.updateAccCard(accCard));
accountCard.setOperationType(CardRecordTypeEnum.CHANGE.getKey());
return toAjax(accCardService.updateAccCard(accountCard));
} catch (Exception e) {
return error(e.getMessage());
}
@ -119,11 +119,11 @@ public class AccCardController extends BaseController {
//@RequiresPermissions("account:card:edit")
@SysLog(title = "人员卡片资料", businessType = OperaType.UPDATE, logType = 1,module = "仓储管理->挂失")
@PostMapping("/loss")
public AjaxResult loss(@RequestBody AccCard accCard) {
public AjaxResult loss(@RequestBody AccountCard accountCard) {
try {
//accCard.setOperationType(CardRecordTypeEnum.LOSS.getKey());
accCard.setCardStatus(CardStatusEnum.LOSS.getKey());
return toAjax(accCardService.updateAccCard(accCard));
accountCard.setCardStatus(CardStatusEnum.LOSS.getKey());
return toAjax(accCardService.updateAccCard(accountCard));
} catch (Exception e) {
return error(e.getMessage());
}
@ -134,11 +134,11 @@ public class AccCardController extends BaseController {
//@RequiresPermissions("account:card:edit")
@SysLog(title = "人员卡片资料", businessType = OperaType.UPDATE, logType = 1,module = "仓储管理->解挂")
@PostMapping("/relieve")
public AjaxResult relieve(@RequestBody AccCard accCard) {
public AjaxResult relieve(@RequestBody AccountCard accountCard) {
try {
//accCard.setOperationType(CardRecordTypeEnum.RELIEVE.getKey());
accCard.setCardStatus(CardStatusEnum.NORMAL.getKey());
return toAjax(accCardService.updateAccCard(accCard));
accountCard.setCardStatus(CardStatusEnum.NORMAL.getKey());
return toAjax(accCardService.updateAccCard(accountCard));
} catch (Exception e) {
return error(e.getMessage());
}
@ -149,11 +149,11 @@ public class AccCardController extends BaseController {
//@RequiresPermissions("account:card:edit")
@SysLog(title = "人员卡片资料", businessType = OperaType.UPDATE, logType = 1,module = "仓储管理->退卡")
@PostMapping("/refund")
public AjaxResult refund(@RequestBody AccCard accCard) {
public AjaxResult refund(@RequestBody AccountCard accountCard) {
try {
accCard.setOperationType(CardRecordTypeEnum.REFUND.getKey());
accCard.setCardStatus(CardStatusEnum.REFUND.getKey());
return toAjax(accCardService.updateAccCard(accCard));
accountCard.setOperationType(CardRecordTypeEnum.REFUND.getKey());
accountCard.setCardStatus(CardStatusEnum.REFUND.getKey());
return toAjax(accCardService.updateAccCard(accountCard));
} catch (Exception e) {
return error(e.getMessage());
}

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

@ -1,6 +1,6 @@
package com.bonus.canteen.core.account.controller;
import com.bonus.canteen.core.account.domain.AccInfo;
import com.bonus.canteen.core.account.domain.AccountInfo;
import com.bonus.canteen.core.account.domain.param.*;
import com.bonus.canteen.core.account.domain.vo.AccInfoDetailsVO;
import com.bonus.canteen.core.account.service.AccOperationHistoryService;
@ -82,9 +82,9 @@ public class AccInfoController extends BaseController {
//@RequiresPermissions("account:info:add")
@SysLog(title = "账户资料", businessType = OperaType.INSERT, logType = 1,module = "仓储管理->新增账户资料")
@PostMapping
public AjaxResult add(@RequestBody AccInfo accInfo) {
public AjaxResult add(@RequestBody AccountInfo accountInfo) {
try {
return toAjax(accInfoService.insertAccInfo(accInfo));
return toAjax(accInfoService.insertAccInfo(accountInfo));
} catch (Exception e) {
return error("系统错误, " + e.getMessage());
}
@ -179,8 +179,8 @@ public class AccInfoController extends BaseController {
notes = "移动端查询账户(仅返回钱包余额)"
)
@PostMapping({"/wallet/balance"})
public AjaxResult queryWalletBalance(@RequestBody AccInfo accInfo) {
return success(this.accInfoService.queryWalletBalance(accInfo));
public AjaxResult queryWalletBalance(@RequestBody AccountInfo accountInfo) {
return success(this.accInfoService.queryWalletBalance(accountInfo));
}
@ApiOperation("单人充值")
@PostMapping("/recharge")

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

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

@ -21,7 +21,7 @@ import java.util.Date;
@Data
@ToString
public class AccInfo extends BaseEntity {
public class AccountInfo extends BaseEntity {
private static final long serialVersionUID = 1L;
/** 账户id 主键自增 */

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
@ToString
public class AccTrade extends BaseEntity {
public class AccountTrade extends BaseEntity {
private static final long serialVersionUID = 1L;
/** 交易id */

34
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/bo/AccountInfoHistory.java Normal file
View File

@ -0,0 +1,34 @@
package com.bonus.canteen.core.account.domain.bo;
import com.alibaba.fastjson.annotation.JSONField;
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.bonus.common.core.annotation.Excel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalDateTime;
@Data
public class AccountInfoHistory {
/** 主键id */
@TableId(value = "id", type = IdType.AUTO)
private Long id;
/** 账户id */
@ApiModelProperty(value = "账户id")
private Long accountId;
/** 用户id */
@ApiModelProperty(value = "用户id")
private Long userId;
/** 操作人员用户名 */
@ApiModelProperty(value = "操作人员用户名")
private String operateUserName;
/** 操作类型1-冻结2-解冻3-挂失4-解挂 */
@ApiModelProperty(value = "操作类型1-冻结2-解冻3-挂失4-解挂")
private Integer operationType;
private String createBy;
}

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

@ -8,5 +8,5 @@ public class AccountEnableDisableParam {
@ApiModelProperty(value = "人员id")
private Long userId;
@ApiModelProperty(value = "账户状态 0正常 1停用")
private Long accStatus;
private Long accountStatus;
}

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

5
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/bo/AccOperationHistory.java → bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/domain/vo/AccountInfoHistoryVO.java
View File

@ -1,4 +1,4 @@
package com.bonus.canteen.core.account.domain.bo;
package com.bonus.canteen.core.account.domain.vo;
import com.alibaba.fastjson.annotation.JSONField;
import com.bonus.common.core.annotation.Excel;
@ -6,8 +6,9 @@ import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import java.time.LocalDateTime;
@Data
public class AccOperationHistory {
public class AccountInfoHistoryVO {
@ApiModelProperty("主键")
private Integer id;
@ApiModelProperty("用户编号")

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

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

@ -1,7 +1,7 @@
package com.bonus.canteen.core.account.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.bonus.canteen.core.account.domain.AccInfo;
import com.bonus.canteen.core.account.domain.AccountInfo;
import com.bonus.canteen.core.account.domain.AccInfoVo;
import com.bonus.canteen.core.account.domain.param.AccountInfoQueryParam;
import com.bonus.canteen.core.account.domain.vo.AccInfoDetailsVO;
@ -17,40 +17,40 @@ import java.util.List;
* @author xsheng
* @date 2025-04-05
*/
public interface AccInfoMapper extends BaseMapper<AccInfo> {
public interface AccInfoMapper extends BaseMapper<AccountInfo> {
/**
* 查询账户资料
*
* @param accId 账户资料主键
* @return 账户资料
*/
public AccInfo selectAccInfoById(@Param("accId") Long accId);
public AccountInfo selectAccInfoById(@Param("accId") Long accId);
/**
* 查询账户资料列表
*
* @param accInfo 账户资料
* @param accountInfo 账户资料
* @return 账户资料集合
*/
public List<AccInfo> selectAccInfoList(AccInfo accInfo);
public List<AccountInfo> selectAccInfoList(AccountInfo accountInfo);
public AccInfoVo selectAccInfoVo(AccInfo accInfo);
public AccInfoVo selectAccInfoVo(AccountInfo accountInfo);
/**
* 新增账户资料
*
* @param accInfo 账户资料
* @param accountInfo 账户资料
* @return 结果
*/
public int insertAccInfo(AccInfo accInfo);
public int insertAccInfo(AccountInfo accountInfo);
/**
* 修改账户资料
*
* @param accInfo 账户资料
* @param accountInfo 账户资料
* @return 结果
*/
public int updateAccInfo(AccInfo accInfo);
public int updateAccInfo(AccountInfo accountInfo);
/**
* 删除账户资料

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

@ -1,15 +1,16 @@
package com.bonus.canteen.core.account.mapper;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.bonus.canteen.core.account.domain.bo.AccOperationHistory;
import com.bonus.canteen.core.account.domain.bo.AccountInfoHistory;
import com.bonus.canteen.core.account.domain.param.AccOperationQueryParam;
import com.bonus.canteen.core.account.domain.vo.AccountInfoHistoryVO;
import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Param;
import java.util.List;
@Mapper
public interface AccOperationHistoryMapper extends BaseMapper<AccOperationHistory> {
List<AccOperationHistory> queryPageAccOperationRecord(@Param("param") AccOperationQueryParam param,
@Param("encryptedSearchValue") String encryptedSearchValue);
public interface AccOperationHistoryMapper extends BaseMapper<AccountInfoHistory> {
List<AccountInfoHistoryVO> queryPageAccOperationRecord(@Param("param") AccOperationQueryParam param,
@Param("encryptedSearchValue") String encryptedSearchValue);
}

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;
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.param.AccConsumeDetailQueryParam;
import com.bonus.canteen.core.account.domain.param.AccWalletOperationQueryParam;
@ -24,35 +24,35 @@ public interface AccTradeMapper {
* @param tradeId 账户交易记录主键
* @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 账户交易记录集合
*/
public List<AccTrade> selectAccTradeList(AccTrade accTrade);
public List<AccountTrade> selectAccTradeList(AccountTrade accountTrade);
/**
* 新增账户交易记录
*
* @param accTrade 账户交易记录
* @param accountTrade 账户交易记录
* @return 结果
*/
public int insertAccTrade(AccTrade accTrade);
public int insertAccTrade(AccountTrade accountTrade);
// public int insertAccTradeVo(AccTradeVo accTrade);
/**
* 修改账户交易记录
*
* @param accTrade 账户交易记录
* @param accountTrade 账户交易记录
* @return 结果
*/
public int updateAccTrade(AccTrade accTrade);
public int updateAccTrade(AccountTrade accountTrade);
public int updateAccTradeVoByOrderNo(AccTradeVo accTradeVo);

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

@ -1,12 +1,13 @@
package com.bonus.canteen.core.account.service;
import com.bonus.canteen.core.account.domain.bo.AccOperationHistory;
import com.bonus.canteen.core.account.domain.bo.AccountInfoHistory;
import com.bonus.canteen.core.account.domain.param.AccOperationQueryParam;
import com.bonus.canteen.core.account.domain.vo.AccountInfoHistoryVO;
import java.util.List;
public interface AccOperationHistoryService {
List<AccOperationHistory> selectAccOperationHistory(AccOperationQueryParam param);
List<AccountInfoHistoryVO> selectAccOperationHistory(AccOperationQueryParam param);
void addAccOperationHistory(Long userId, Integer type);
}

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

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

@ -1,6 +1,6 @@
package com.bonus.canteen.core.account.service;
import com.bonus.canteen.core.account.domain.AccInfo;
import com.bonus.canteen.core.account.domain.AccountInfo;
import com.bonus.canteen.core.account.domain.WalletBalanceVO;
import com.bonus.canteen.core.account.domain.param.*;
import com.bonus.canteen.core.account.domain.vo.AccInfoDetailsVO;
@ -23,7 +23,7 @@ public interface IAccInfoService {
* @param id 账户资料主键
* @return 账户资料
*/
public AccInfo selectAccInfoById(Long id);
public AccountInfo selectAccInfoById(Long id);
/**
* 查询账户资料列表
@ -37,10 +37,10 @@ public interface IAccInfoService {
/**
* 新增账户资料
*
* @param accInfo 账户资料
* @param accountInfo 账户资料
* @return 结果
*/
public int insertAccInfo(AccInfo accInfo);
public int insertAccInfo(AccountInfo accountInfo);
/**
* 修改账户资料
@ -66,7 +66,7 @@ public interface IAccInfoService {
public String getOrderQRCode();
public WalletBalanceVO queryWalletBalance(AccInfo accInfo);
public WalletBalanceVO queryWalletBalance(AccountInfo accountInfo);
List<AccInfoDetailsVO> queryAccInfoByUserIds(List<Long> userIds);
AccInfoDetailsVO queryAccInfoByUserId(Long userId);
void checkAccStatus(AccInfoDetailsVO accInfoVO);

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;
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.param.AccConsumeDetailQueryParam;
import com.bonus.canteen.core.account.domain.param.AccWalletOperationQueryParam;
@ -24,35 +24,35 @@ public interface IAccTradeService {
* @param tradeId 账户交易记录主键
* @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 账户交易记录集合
*/
public List<AccTrade> selectAccTradeList(AccTrade accTrade);
public List<AccountTrade> selectAccTradeList(AccountTrade accountTrade);
/**
* 新增账户交易记录
*
* @param accTrade 账户交易记录
* @param accountTrade 账户交易记录
* @return 结果
*/
public int insertAccTrade(AccTrade accTrade);
public int insertAccTrade(AccountTrade accountTrade);
public int insertAccTradeVo(AccTradeVo accTrade);
/**
* 修改账户交易记录
*
* @param accTrade 账户交易记录
* @param accountTrade 账户交易记录
* @return 结果
*/
public int updateAccTrade(AccTrade accTrade);
public int updateAccTrade(AccountTrade accountTrade);
public int updateAccTradeVoByOrderNo(AccTradeVo accTrade);

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

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

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

@ -85,7 +85,7 @@ public class AccInfoServiceImpl implements IAccInfoService {
* @return 账户资料
*/
@Override
public AccInfo selectAccInfoById(Long id) {
public AccountInfo selectAccInfoById(Long id) {
return accInfoMapper.selectAccInfoById(id);
}
@ -96,8 +96,8 @@ public class AccInfoServiceImpl implements IAccInfoService {
@Override
public List<AccInfoDetailsVO> selectAccInfoList(AccountInfoQueryParam accountInfoQueryParam) {
String encryptedSearchValue = SM4EncryptUtils.sm4Encrypt(accountInfoQueryParam.getSearchValue());
if(CollUtil.isEmpty(accountInfoQueryParam.getAccStatusList())) {
accountInfoQueryParam.setAccStatusList(AccStatusEnum.getAllKeys());
if(CollUtil.isEmpty(accountInfoQueryParam.getAccountStatusList())) {
accountInfoQueryParam.setAccountStatusList(AccStatusEnum.getAllKeys());
}
List<AccInfoDetailsVO> list = accInfoMapper.queryAccInfoDetails(accountInfoQueryParam, encryptedSearchValue);
handleResult(list);
@ -112,14 +112,14 @@ public class AccInfoServiceImpl implements IAccInfoService {
/**
* 新增账户资料
*
* @param accInfo 账户资料
* @param accountInfo 账户资料
* @return 结果
*/
@Override
public int insertAccInfo(AccInfo accInfo) {
accInfo.setCreateTime(DateUtils.getNowDate());
public int insertAccInfo(AccountInfo accountInfo) {
accountInfo.setCreateTime(DateUtils.getNowDate());
try {
return accInfoMapper.insertAccInfo(accInfo);
return accInfoMapper.insertAccInfo(accountInfo);
} catch (Exception e) {
throw new ServiceException("错误信息描述");
}
@ -193,17 +193,17 @@ public class AccInfoServiceImpl implements IAccInfoService {
rollbackFor = {Exception.class}
)
public int syncAccInfo(SysUser sysUser) {
AccInfo accInfo = new AccInfo();
accInfo.setAccountStatus(AccStatusEnum.NORMAL.getKey());
accInfo.setUserId(sysUser.getUserId());
accInfoMapper.insertAccInfo(accInfo);
AccountInfo accountInfo = new AccountInfo();
accountInfo.setAccountStatus(AccStatusEnum.NORMAL.getKey());
accountInfo.setUserId(sysUser.getUserId());
accInfoMapper.insertAccInfo(accountInfo);
List<AccWalletInfo> accWalletInfos = new ArrayList();
AccWalletTypeEnum[] accWalletTypeEnums = AccWalletTypeEnum.values();
for(int i = 0; i < accWalletTypeEnums.length; ++i) {
AccWalletTypeEnum accWalletTypeEnum = accWalletTypeEnums[i];
AccWalletInfo accWalletInfo = new AccWalletInfo();
accWalletInfo.setAccountId(accInfo.getAccountId());
accWalletInfo.setAccountId(accountInfo.getAccountId());
accWalletInfo.setUserId(sysUser.getUserId());
accWalletInfo.setWalletType(accWalletTypeEnum.getKey());
accWalletInfos.add(accWalletInfo);
@ -306,21 +306,21 @@ public class AccInfoServiceImpl implements IAccInfoService {
public AccInfoDetailsVO queryAccInfoBalanceSum(AccountInfoQueryParam accountInfoQueryParam) {
String encryptedSearchValue = SM4EncryptUtils.sm4Encrypt(accountInfoQueryParam.getSearchValue());
if(CollUtil.isEmpty(accountInfoQueryParam.getAccStatusList())) {
accountInfoQueryParam.setAccStatusList(AccStatusEnum.getAllKeys());
if(CollUtil.isEmpty(accountInfoQueryParam.getAccountStatusList())) {
accountInfoQueryParam.setAccountStatusList(AccStatusEnum.getAllKeys());
}
return accInfoMapper.queryAccInfoBalanceSum(accountInfoQueryParam, encryptedSearchValue);
}
@Transactional(rollbackFor = {Exception.class})
public void editAccountStatus(AccountEnableDisableParam accountEnableDisableParam) {
int flag = accInfoMapper.update((((Wrappers.lambdaUpdate(AccInfo.class)
.set(AccInfo::getAccountStatus, accountEnableDisableParam.getAccStatus()))
.set(AccInfo::getUpdateBy, SecurityUtils.getUserId()))
.set(AccInfo::getUpdateTime, LocalDateTime.now()))
.eq(AccInfo::getUserId, accountEnableDisableParam.getUserId()));
int flag = accInfoMapper.update((((Wrappers.lambdaUpdate(AccountInfo.class)
.set(AccountInfo::getAccountStatus, accountEnableDisableParam.getAccountStatus()))
.set(AccountInfo::getUpdateBy, SecurityUtils.getUserId()))
.set(AccountInfo::getUpdateTime, LocalDateTime.now()))
.eq(AccountInfo::getUserId, accountEnableDisableParam.getUserId()));
if (flag > 0) {
this.accOperationHistoryService.addAccOperationHistory(accountEnableDisableParam.getUserId(), accountEnableDisableParam.getAccStatus().intValue());
this.accOperationHistoryService.addAccOperationHistory(accountEnableDisableParam.getUserId(), accountEnableDisableParam.getAccountStatus().intValue());
try {
DeviceMqPersonalUpdateMessageDTO bean = new DeviceMqPersonalUpdateMessageDTO().setUpdatePerson(Math.toIntExact(accountEnableDisableParam.getUserId()),"update");
String jsonString = JacksonUtil.writeValueAsString(bean);
@ -333,9 +333,9 @@ public class AccInfoServiceImpl implements IAccInfoService {
}
public WalletBalanceVO queryWalletBalance(AccInfo accInfo) {
log.info("查询账户余额入参={}", JSONUtil.toJsonStr(accInfo));
AccInfoVo accInfoVO = accInfoMapper.selectAccInfoVo(accInfo);
public WalletBalanceVO queryWalletBalance(AccountInfo accountInfo) {
log.info("查询账户余额入参={}", JSONUtil.toJsonStr(accountInfo));
AccInfoVo accInfoVO = accInfoMapper.selectAccInfoVo(accountInfo);
if (ObjectUtil.isNull(accInfoVO)) {
throw new ServiceException("账户不存在");
} else {

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

@ -4,8 +4,9 @@ import cn.hutool.core.collection.CollUtil;
import com.alibaba.fastjson.JSON;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import com.bonus.canteen.core.account.domain.bo.AccOperationHistory;
import com.bonus.canteen.core.account.domain.bo.AccountInfoHistory;
import com.bonus.canteen.core.account.domain.param.AccOperationQueryParam;
import com.bonus.canteen.core.account.domain.vo.AccountInfoHistoryVO;
import com.bonus.canteen.core.account.mapper.AccOperationHistoryMapper;
import com.bonus.canteen.core.account.service.AccOperationHistoryService;
import com.bonus.common.core.constant.SecurityConstants;
@ -22,14 +23,14 @@ import java.util.List;
import java.util.Objects;
@Service
public class AccOperationHistoryServiceImpl extends ServiceImpl<AccOperationHistoryMapper, AccOperationHistory> implements AccOperationHistoryService {
public class AccOperationHistoryServiceImpl extends ServiceImpl<AccOperationHistoryMapper, AccountInfoHistory> implements AccOperationHistoryService {
@Resource
private RemoteUserService remoteUserService;
public List<AccOperationHistory> selectAccOperationHistory(AccOperationQueryParam param) {
public List<AccountInfoHistoryVO> selectAccOperationHistory(AccOperationQueryParam param) {
String encryptedSearchValue = SM4EncryptUtils.sm4Encrypt(param.getSearchValue());
List<AccOperationHistory> operationRecordList = this.baseMapper.queryPageAccOperationRecord(param, encryptedSearchValue);
List<AccountInfoHistoryVO> operationRecordList = this.baseMapper.queryPageAccOperationRecord(param, encryptedSearchValue);
if(CollUtil.isNotEmpty(operationRecordList)) {
for(AccOperationHistory history : operationRecordList) {
for(AccountInfoHistoryVO history : operationRecordList) {
history.setPhone(SM4EncryptUtils.sm4Decrypt(history.getPhone()));
}
}
@ -40,13 +41,11 @@ public class AccOperationHistoryServiceImpl extends ServiceImpl<AccOperationHist
AjaxResult userResult = remoteUserService.getInfo(userId , SecurityConstants.INNER);
if(Objects.nonNull(userResult)) {
SysUser sysUser = JSONObject.parseObject(JSON.toJSONString(userResult.get(AjaxResult.DATA_TAG)), SysUser.class);
AccOperationHistory accOperationRecord = new AccOperationHistory();
AccountInfoHistory accOperationRecord = new AccountInfoHistory();
accOperationRecord.setOperationType(type);
accOperationRecord.setUserId(userId);
accOperationRecord.setUserName(sysUser.getUserName());
accOperationRecord.setPhone(sysUser.getPhonenumber());
accOperationRecord.setOperateUserName(sysUser.getUserName());
accOperationRecord.setCreateBy(SecurityUtils.getUsername());
accOperationRecord.setCreateTime(LocalDateTime.now());
this.baseMapper.insert(accOperationRecord);
}
}

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 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.param.AccConsumeDetailQueryParam;
import com.bonus.canteen.core.account.domain.param.AccWalletOperationQueryParam;
@ -40,47 +40,47 @@ public class AccTradeServiceImpl implements IAccTradeService {
* @return 账户交易记录
*/
@Override
public AccTrade selectAccTradeByTradeId(Long tradeId) {
public AccountTrade selectAccTradeByTradeId(Long tradeId) {
return accTradeMapper.selectAccTradeByTradeId(tradeId);
}
@Override
public List<AccTrade> selectAccTradeByOrderNo(Long orderNo) {
public List<AccountTrade> selectAccTradeByOrderNo(Long orderNo) {
return accTradeMapper.selectAccTradeByOrderNo(orderNo);
}
/**
* 查询账户交易记录列表
*
* @param accTrade 账户交易记录
* @param accountTrade 账户交易记录
* @return 账户交易记录
*/
@Override
public List<AccTrade> selectAccTradeList(AccTrade accTrade) {
return accTradeMapper.selectAccTradeList(accTrade);
public List<AccountTrade> selectAccTradeList(AccountTrade accountTrade) {
return accTradeMapper.selectAccTradeList(accountTrade);
}
/**
* 新增账户交易记录
*
* @param accTrade 账户交易记录
* @param accountTrade 账户交易记录
* @return 结果
*/
@Override
@Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRES_NEW)
public int insertAccTrade(AccTrade accTrade) {
accTrade.setCreateTime(DateUtils.getNowDate());
accTrade.setUpdateTime(DateUtils.getNowDate());
return accTradeMapper.insertAccTrade(accTrade);
public int insertAccTrade(AccountTrade accountTrade) {
accountTrade.setCreateTime(DateUtils.getNowDate());
accountTrade.setUpdateTime(DateUtils.getNowDate());
return accTradeMapper.insertAccTrade(accountTrade);
}
@Override
public int insertAccTradeVo(AccTradeVo accTradeVo) {
accTradeVo.setCreateTime(DateUtils.getNowDate());
try {
AccTrade accTrade = new AccTrade();
BeanUtils.copyProperties(accTradeVo, accTrade);
return accTradeMapper.insertAccTrade(accTrade);
AccountTrade accountTrade = new AccountTrade();
BeanUtils.copyProperties(accTradeVo, accountTrade);
return accTradeMapper.insertAccTrade(accountTrade);
} catch (Exception e) {
throw new ServiceException("错误信息描述" + e.getMessage());
}
@ -89,15 +89,15 @@ public class AccTradeServiceImpl implements IAccTradeService {
/**
* 修改账户交易记录
*
* @param accTrade 账户交易记录
* @param accountTrade 账户交易记录
* @return 结果
*/
@Override
@Transactional(rollbackFor = Exception.class, propagation = Propagation.REQUIRES_NEW)
public int updateAccTrade(AccTrade accTrade) {
accTrade.setUpdateTime(DateUtils.getNowDate());
public int updateAccTrade(AccountTrade accountTrade) {
accountTrade.setUpdateTime(DateUtils.getNowDate());
try {
return accTradeMapper.updateAccTrade(accTrade);
return accTradeMapper.updateAccTrade(accountTrade);
} catch (Exception e) {
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"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<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="userId" column="user_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
</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"/>
<where>
<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}
</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
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="userId != null">user_id,</if>
@ -93,7 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</trim>
</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
<trim prefix="SET" suffixOverrides=",">
<if test="userId != null">user_id = #{userId},</if>

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

@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.bonus.canteen.core.account.mapper.AccInfoMapper">
<resultMap type="com.bonus.canteen.core.account.domain.AccInfo" id="AccInfoResult">
<resultMap type="com.bonus.canteen.core.account.domain.AccountInfo" id="AccInfoResult">
<result property="accountId" column="account_id" />
<result property="accountName" column="account_name" />
<result property="userId" column="user_id" />
@ -46,7 +46,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
from account_info
</sql>
<select id="selectAccInfoList" parameterType="com.bonus.canteen.core.account.domain.AccInfo" resultMap="AccInfoResult">
<select id="selectAccInfoList" parameterType="com.bonus.canteen.core.account.domain.AccountInfo" resultMap="AccInfoResult">
<include refid="selectAccInfoVo"/>
<where>
<if test="accountId != null "> and account_id = #{accountId}</if>
@ -78,7 +78,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</where>
</select>
<select id="selectAccInfoVo" parameterType="com.bonus.canteen.core.account.domain.AccInfo" resultType="com.bonus.canteen.core.account.domain.AccInfoVo">
<select id="selectAccInfoVo" parameterType="com.bonus.canteen.core.account.domain.AccountInfo" resultType="com.bonus.canteen.core.account.domain.AccInfoVo">
<include refid="selectAccInfoVo"/>
<where>
<if test="accountId != null "> and account_id = #{accountId}</if>
@ -115,7 +115,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
where account_id = #{accId}
</select>
<insert id="insertAccInfo" parameterType="com.bonus.canteen.core.account.domain.AccInfo" useGeneratedKeys="true" keyProperty="accId">
<insert id="insertAccInfo" parameterType="com.bonus.canteen.core.account.domain.AccountInfo" useGeneratedKeys="true" keyProperty="accId">
insert into account_info
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="accountName != null and accountName != ''">account_name,</if>
@ -180,7 +180,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</trim>
</insert>
<update id="updateAccInfo" parameterType="com.bonus.canteen.core.account.domain.AccInfo">
<update id="updateAccInfo" parameterType="com.bonus.canteen.core.account.domain.AccountInfo">
update account_info
<trim prefix="SET" suffixOverrides=",">
<if test="accountId != null">account_id = #{accountId},</if>
@ -283,7 +283,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<where>
t1.del_flag = 0
and t1.account_status in
<foreach collection="accountInfoQueryParam.accStatusList" item="accStatus" separator="," open="(" close=")">
<foreach collection="accountInfoQueryParam.accountStatusList" item="accStatus" separator="," open="(" close=")">
#{accStatus}
</foreach>
<if test="accountInfoQueryParam.searchValue != null and accountInfoQueryParam.searchValue != ''">

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

@ -3,7 +3,7 @@
PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.bonus.canteen.core.account.mapper.AccOperationHistoryMapper">
<select id="queryPageAccOperationRecord" resultType="com.bonus.canteen.core.account.domain.bo.AccOperationHistory">
<select id="queryPageAccOperationRecord" resultType="com.bonus.canteen.core.account.domain.vo.AccountInfoHistoryVO">
SELECT aih.id,
aih.user_id,
su.nick_name as userName,

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"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<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="tradeTime" column="trade_time" />
<result property="userId" column="user_id" />
@ -48,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
from account_trade
</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"/>
<where>
<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}
</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
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="tradeId != null">trade_id,</if>
@ -166,7 +166,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
</trim>
</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
<trim prefix="SET" suffixOverrides=",">
<if test="tradeTime != null">trade_time = #{tradeTime},</if>