diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/mapper/AccInfoMapper.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/mapper/AccInfoMapper.java index a526b9f..5308749 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/mapper/AccInfoMapper.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/mapper/AccInfoMapper.java @@ -21,10 +21,10 @@ public interface AccInfoMapper extends BaseMapper { /** * 查询账户资料 * - * @param id 账户资料主键 + * @param accId 账户资料主键 * @return 账户资料 */ - public AccInfo selectAccInfoById(Long id); + public AccInfo selectAccInfoById(@Param("accId") Long accId); /** * 查询账户资料列表 diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccCardServiceImpl.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccCardServiceImpl.java index 078fdfa..f0bc96a 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccCardServiceImpl.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/account/service/impl/AccCardServiceImpl.java @@ -15,6 +15,7 @@ import com.bonus.canteen.core.account.mapper.AccInfoMapper; import com.bonus.common.core.exception.ServiceException; import com.bonus.common.core.utils.DateUtils; import com.bonus.common.houqin.constant.LeConstants; +import com.bonus.common.security.utils.SecurityUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import com.bonus.canteen.core.account.mapper.AccCardMapper; @@ -68,10 +69,12 @@ public class AccCardServiceImpl implements IAccCardService { */ @Override public int insertAccCard(AccCard accCard) { + accCard.setCreateBy(SecurityUtils.getUsername()); accCard.setCreateTime(DateUtils.getNowDate()); try { AccInfo accInfo = accInfoMapper.selectAccInfoById(accCard.getAccId()); checkAccInfoAndStatus(accInfo); + accCard.setUserId(accInfo.getUserId()); accCard.setCardStatus(CardStatusEnum.NORMAL.getKey()); accCard.setCardType(CardTypeEnum.IC_CARD.getKey()); int count = accCardMapper.insertAccCard(accCard); @@ -84,8 +87,10 @@ public class AccCardServiceImpl implements IAccCardService { private void saveAccCardChangeRecord(AccCard accCard) { AccCardHis accCardHis = new AccCardHis(); - accCardHis.setUserId(accCardHis.getUserId()); - accCardHis.setAccId(accCardHis.getAccId()); + accCardHis.setCreateBy(SecurityUtils.getUsername()); + accCardHis.setCreateTime(DateUtils.getNowDate()); + accCardHis.setUserId(accCard.getUserId()); + accCardHis.setAccId(accCard.getAccId()); accCardHis.setCardNum(String.valueOf(accCard.getCardNum())); accCardHis.setSerialNum(accCard.getSerialNum()); accCardHis.setCardType(CardTypeEnum.IC_CARD.getKey()); @@ -117,6 +122,7 @@ public class AccCardServiceImpl implements IAccCardService { */ @Override public int updateAccCard(AccCard accCard) { + accCard.setUpdateBy(SecurityUtils.getUsername()); accCard.setUpdateTime(DateUtils.getNowDate()); try { int count = accCardMapper.updateAccCard(accCard);