dianliang/oil-station
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

小程序支付bug

Browse Source
This commit is contained in:
齐天大圣 2024-06-05 16:29:11 +08:00
parent 6be59a1bb4
commit 8d985addf8
3 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueOrders/service/impl/CardValueOrdersServiceImpl.java
View File

@ -11,6 +11,8 @@ import com.fuint.business.order.entity.AllOrderInfo;
import com.fuint.business.order.mapper.AllOrderInfoMapper; import com.fuint.business.order.mapper.AllOrderInfoMapper;
import com.fuint.business.order.service.AllOrderInfoService; import com.fuint.business.order.service.AllOrderInfoService;
import com.fuint.business.order.vo.AllOrderInfoVo; import com.fuint.business.order.vo.AllOrderInfoVo;
import com.fuint.business.storeInformation.entity.LJStore;
import com.fuint.business.storeInformation.service.ILJStoreService;
import com.fuint.business.userManager.entity.UserBalance; import com.fuint.business.userManager.entity.UserBalance;
import com.fuint.business.userManager.service.UserBalanceService; import com.fuint.business.userManager.service.UserBalanceService;
import com.fuint.common.dto.AccountInfo; import com.fuint.common.dto.AccountInfo;
@ -36,6 +38,9 @@ public class CardValueOrdersServiceImpl extends ServiceImpl<CardValueOrdersMappe
@Resource @Resource
private AllOrderInfoService allOrderInfoService; private AllOrderInfoService allOrderInfoService;
@Resource
private ILJStoreService iljStoreService;
/** /**
* 根据订单编号返回订单信息 * 根据订单编号返回订单信息
* @param orderNo * @param orderNo
@ -96,7 +101,8 @@ public class CardValueOrdersServiceImpl extends ServiceImpl<CardValueOrdersMappe
if (ObjectUtil.isNotEmpty(oneByOrderNo)){ if (ObjectUtil.isNotEmpty(oneByOrderNo)){
oneByOrderNo.setPayMoney(oneByOrderNo.getGoodsMoney()); oneByOrderNo.setPayMoney(oneByOrderNo.getGoodsMoney());
if ("paid".equals(status)){ if ("paid".equals(status)){
UserBalance userBalance = userBalanceService.selectUserBalanceByStorId(oneByOrderNo.getUserId(),oneByOrderNo.getStoreId()); LJStore ljStore = iljStoreService.selectStoreByStoreId(oneByOrderNo.getStoreId());
UserBalance userBalance = userBalanceService.selectUserBalance(oneByOrderNo.getUserId(),ljStore.getChainStoreId());
Double cardBalance = 0.0; Double cardBalance = 0.0;
cardBalance = userBalance.getCardBalance() + oneByOrderNo.getPayMoney(); cardBalance = userBalance.getCardBalance() + oneByOrderNo.getPayMoney();
userBalance.setCardBalance(cardBalance); userBalance.setCardBalance(cardBalance);

6
fuintBackend/fuint-application/src/main/java/com/fuint/business/tag/controller/OilTagController.java
View File

@ -86,12 +86,16 @@ public class OilTagController extends BaseController {
LambdaQueryWrapper<TagCodeRecord> queryWrapper1 = new LambdaQueryWrapper<>(); LambdaQueryWrapper<TagCodeRecord> queryWrapper1 = new LambdaQueryWrapper<>();
queryWrapper1.eq(TagCodeRecord::getOilTagId,oilTagId); queryWrapper1.eq(TagCodeRecord::getOilTagId,oilTagId);
TagCodeRecord one = tagCodeRecordService.getOne(queryWrapper1); TagCodeRecord one = tagCodeRecordService.getOne(queryWrapper1);
OilTagVO oilTagVO = new OilTagVO(); OilTagVO oilTagVO = new OilTagVO();
BeanUtils.copyProperties(record,oilTagVO); BeanUtils.copyProperties(record,oilTagVO);
if (ObjectUtils.isNotEmpty(one)){ if (ObjectUtils.isNotEmpty(one)){
oilTagVO.setStoreName(one.getStoreName()); oilTagVO.setStoreName(one.getStoreName());
if (ObjectUtils.isNotEmpty(one.getStaffName())){
oilTagVO.setMtStatus("1");
oilTagVO.setStaffName(one.getStaffName());
}
} }
oilTagVOArrayList.add(oilTagVO); oilTagVOArrayList.add(oilTagVO);
} }
page1.setRecords(oilTagVOArrayList); page1.setRecords(oilTagVOArrayList);

1
fuintBackend/fuint-application/src/main/java/com/fuint/business/tag/vo/OilTagVO.java
View File

@ -9,4 +9,5 @@ import java.io.Serializable;
public class OilTagVO extends OilTag implements Serializable { public class OilTagVO extends OilTag implements Serializable {
//店铺名字 //店铺名字
private String storeName; private String storeName;
private String staffName;
} }