diff --git a/fuintAdmin/src/views/convenienceStore/index.vue b/fuintAdmin/src/views/convenienceStore/index.vue index bbc20cd15..4dd56c538 100644 --- a/fuintAdmin/src/views/convenienceStore/index.vue +++ b/fuintAdmin/src/views/convenienceStore/index.vue @@ -372,10 +372,15 @@ export default { } if (this.form.id) { updateCevGood(this.form).then(response => { - this.$modal.msgSuccess("分类更新成功"); - this.open = false; - this.getList(); - this.getFirstMenu(); + if (response.data==1){ + this.$modal.msgSuccess("分类更新成功"); + this.open = false; + this.getList(); + this.getFirstMenu(); + }else { + this.$modal.msgError("分类名称已存在，修改失败"); + } + }); } else { insertCvsGoods(this.form).then(response => { diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/MerchantConfigServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/MerchantConfigServiceImpl.java index 558ab004f..b1f09d808 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/MerchantConfigServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/MerchantConfigServiceImpl.java @@ -99,8 +99,10 @@ public class MerchantConfigServiceImpl extends ServiceImpl(); queryWrapper.eq("is_use",1); + queryWrapper.eq("store_id",nowAccountInfo.getStoreId()); List list = baseMapper.selectList(queryWrapper); for (MerchantConfig config : list) { config.setIsUse("0"); @@ -112,7 +114,10 @@ public class MerchantConfigServiceImpl extends ServiceImpl list = baseMapper.selectList(null); + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + QueryWrapper queryWrapper = new QueryWrapper(); + queryWrapper.eq("store_id",nowAccountInfo.getStoreId()); + List list = baseMapper.selectList(queryWrapper); int row = 0; for (MerchantConfig merchantConfig : list) { merchantConfig.setIsOpenRule(isOpenRule); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/mapper/CvsGoodsMapper.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/mapper/CvsGoodsMapper.java index fc5a45eb7..81f3ee1b9 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/mapper/CvsGoodsMapper.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/mapper/CvsGoodsMapper.java @@ -26,7 +26,7 @@ public interface CvsGoodsMapper extends BaseMapper { List selectCvsGoodsTreeList(CvsGoods goods); //根据id和name查找 - List selectGoodsList(CvsGoods goods); + List selectGoodsList(@Param("goods") CvsGoods goods); void deleteByIdVo(Integer id); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/mapper/xml/CvsGoodsMapper.xml b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/mapper/xml/CvsGoodsMapper.xml index 7b57603bb..ee78aef9d 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/mapper/xml/CvsGoodsMapper.xml +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/convenienceSore/mapper/xml/CvsGoodsMapper.xml @@ -14,14 +14,17 @@ + select cvco.*,cvc.card_child_phones from card_value_child_order cvco left join card_valud_childrens cvc on cvco.card_value_child_id = cvc.id + + + and cvco.store_id = #{order.storeId} + + + and cvc.card_child_phones = #{order.cardChildPhones} + + order by cvco.pay_time desc + + + \ No newline at end of file diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/CardValueChildOrderService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/CardValueChildOrderService.java new file mode 100644 index 000000000..27a5ae128 --- /dev/null +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/CardValueChildOrderService.java @@ -0,0 +1,37 @@ +package com.fuint.business.order.service; + +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.fuint.business.order.entity.CardValueChildOrder; +import com.fuint.business.order.vo.CardValueChildOrderVo; + +public interface CardValueChildOrderService { + /** + * 根据条件分页查询子卡订单信息 + * @param page + * @param cardValueChildOrderVo + * @return + */ + IPage selectCardValueChildOrderList(Page page, CardValueChildOrderVo cardValueChildOrderVo); + + /** + * 根据订单号查询子卡消费订单信息 + * @param orderNo + * @return + */ + CardValueChildOrder selectCardValueChildOrderByOrderNo(String orderNo); + + /** + * 添加储值卡子卡订单信息 + * @param cardValueChildOrder + * @return + */ + int insertCardValueChildOrder(CardValueChildOrder cardValueChildOrder); + + /** + * 修改储值卡子卡订单信息 + * @param cardValueChildOrder + * @return + */ + int updateCardValueChildOrder(CardValueChildOrder cardValueChildOrder); +} diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/CardValueChildOrderServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/CardValueChildOrderServiceImpl.java new file mode 100644 index 000000000..4ade49efb --- /dev/null +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/CardValueChildOrderServiceImpl.java @@ -0,0 +1,57 @@ +package com.fuint.business.order.service.impl; + +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; +import com.baomidou.mybatisplus.core.metadata.IPage; +import com.baomidou.mybatisplus.extension.plugins.pagination.Page; +import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.fuint.business.marketingActivity.cardValueChildrens.entity.CardValudChildrens; +import com.fuint.business.marketingActivity.cardValueChildrens.service.CardValudChildrensService; +import com.fuint.business.order.entity.CardValueChildOrder; +import com.fuint.business.order.mapper.CardValueChildOrderMapper; +import com.fuint.business.order.service.CardValueChildOrderService; +import com.fuint.business.order.vo.CardValueChildOrderVo; +import com.fuint.business.storeInformation.entity.LJStore; +import com.fuint.business.storeInformation.service.ILJStoreService; +import com.fuint.business.userManager.entity.LJUser; +import com.fuint.business.userManager.service.LJUserService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +@Service +public class CardValueChildOrderServiceImpl extends ServiceImpl implements CardValueChildOrderService { + @Autowired + private LJUserService userService; + @Autowired + private ILJStoreService storeService; + @Autowired + private CardValudChildrensService cardValudChildrensService; + + @Override + public IPage selectCardValueChildOrderList(Page page, CardValueChildOrderVo cardValueChildOrderVo) { + return baseMapper.selectCardValueChildOrderList(page,cardValueChildOrderVo); + } + + @Override + public CardValueChildOrder selectCardValueChildOrderByOrderNo(String orderNo) { + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("order_no",orderNo); + return baseMapper.selectOne(queryWrapper); + } + + @Override + public int insertCardValueChildOrder(CardValueChildOrder cardValueChildOrder) { + LJUser user = userService.queryUserByUserId(cardValueChildOrder.getUserId()); + LJStore store = storeService.selectStoreByStoreId(cardValueChildOrder.getStoreId()); + CardValudChildrens cardValudChildrens = cardValudChildrensService.selectCardValueChildrenByMobileAndStoreId(user.getMobile(), cardValueChildOrder.getStoreId()); + + cardValueChildOrder.setCardValueId(cardValudChildrens.getCardValueId()); + cardValueChildOrder.setCardValueChildId(cardValudChildrens.getId()); + cardValueChildOrder.setChainStoreId(store.getChainStoreId()); + return baseMapper.insert(cardValueChildOrder); + } + + @Override + public int updateCardValueChildOrder(CardValueChildOrder cardValueChildOrder) { + return baseMapper.updateById(cardValueChildOrder); + } +} diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java index ef27d8ab9..d2e6d4d15 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/OilOrderServiceImpl.java @@ -19,6 +19,8 @@ import com.fuint.business.marketingActivity.cardFule.entity.CardFuelRecord; import com.fuint.business.marketingActivity.cardFule.mapper.CardFuelRecordMapper; import com.fuint.business.marketingActivity.cardValue.entity.CardValueRecord; import com.fuint.business.marketingActivity.cardValue.mapper.CardValueRecordMapper; +import com.fuint.business.marketingActivity.cardValueChildrens.entity.CardValudChildrens; +import com.fuint.business.marketingActivity.cardValueChildrens.service.CardValudChildrensService; import com.fuint.business.member.mapper.LJStaffMapper; import com.fuint.business.order.entity.*; import com.fuint.business.order.mapper.LJOrderMapper; @@ -701,7 +703,7 @@ public class OilOrderServiceImpl extends ServiceImpl i public Map appletPay(Map map) { String orderNo = map.get("orderNo"); // 支付金额 - Integer payAmount = (int) (Double.valueOf(map.get("payAmount"))*100); + Double payAmount = Double.valueOf(map.get("payAmount")); // 优惠金额 String discountAmount = map.get("discountAmount"); // 囤油卡消费后的信息 @@ -714,12 +716,26 @@ public class OilOrderServiceImpl extends ServiceImpl i String balanceAmount = map.get("balanceAmount"); Integer tankId = Integer.valueOf(map.get("tankId")); +// 是否使用子卡消费 + String isUseChildCard = map.get("isUseChildCard"); + // 根据订单号查询订单信息 OilOrder oilOrder = this.selectOilOrderByOrderNo(orderNo); // 获取油品信息 OilNumber oilNumber = oilNumberService.selectOilNumberByOilName(oilOrder.getOils(), oilOrder.getStoreId()); boolean result = false; + Integer userId = oilOrder.getUserId(); + + if (isUseChildCard.equals("true")){ + Map map1 = userService.queryUserByStoreId(oilOrder.getStoreId(), oilOrder.getUserId()); + String isUseChild = map1.get("isUseChild").toString(); + LJUserVo userVo = (LJUserVo) map1.get("userVo"); + userId = userVo.getId(); + if (!isUseChild.equals("yes")){ + result = true; + } + } if (isOilStorageCard.equals("true")) { // 使用囤油卡 @@ -752,6 +768,13 @@ public class OilOrderServiceImpl extends ServiceImpl i Map applet = new HashMap<>(); applet.put("success",""); + +// 判断是否使用储值卡消费 + if (!balanceAmount.equals("0")){ + this.insertCardBalance(Double.valueOf(balanceAmount),userId,oilOrder.getStoreId()); + } + +// 判断是否需要调起支付 if (!map.get("payAmount").equals("0")) { // 调用支付接口 // 判断是否开启支付规则 @@ -759,15 +782,17 @@ public class OilOrderServiceImpl extends ServiceImpl i // if (list.size() > 0) { // oilConfigService.oilRule(); // } + + this.insertCardOrder(oilOrder.getUserId(),oilOrder.getStoreId(),orderNo,oilOrder.getOrderAmount(),"unpaid", Double.valueOf(balanceAmount),payAmount); // 处理支付需要的数据 ReceiveParameter receiveParameter = new ReceiveParameter(); receiveParameter.setOrderNo(orderNo); receiveParameter.setType("1"); receiveParameter.setContent("油品订单"); - receiveParameter.setGoodsMoney(oilOrder.getOrderAmount()); + receiveParameter.setGoodsMoney(Double.valueOf(map.get("payAmount"))); receiveParameter.setStoreId(oilOrder.getStoreId()); receiveParameter.setPayType(oilOrder.getPayType()); - receiveParameter.setUserId(oilOrder.getUserId()); + receiveParameter.setUserId(userId); // 调用支付接口 try { applet = fyPayService.applet(receiveParameter); @@ -776,33 +801,84 @@ public class OilOrderServiceImpl extends ServiceImpl i e.printStackTrace(); } }else { - this.updateGrowthValue(Double.valueOf(payAmount),oilOrder.getUserId(), Integer.valueOf(oilOrder.getOils()),oilCardAmount,oilOrder.getStoreId()); + this.updateGrowthValue(payAmount,userId, Integer.valueOf(oilOrder.getOils()),oilCardAmount,oilOrder.getStoreId()); this.addOilTracks(oilOrder,oilOrder.getStoreId()); - this.insertCardBalance(Double.valueOf(balanceAmount),oilOrder.getUserId(),oilOrder.getStoreId()); - oilOrder.setPayAmount(Double.valueOf(payAmount)); + this.insertCardOrder(oilOrder.getUserId(),oilOrder.getStoreId(),orderNo,oilOrder.getOrderAmount(),"paid", Double.valueOf(balanceAmount),payAmount); + oilOrder.setPayAmount(payAmount); oilOrder.setDiscountAmount(Double.valueOf(discountAmount)); oilOrder.setPayTime(new Date()); oilOrder.setOrderStatus("paid"); baseMapper.updateById(oilOrder); applet.put("success","ok"); } + +// 修改订单的优惠金额和支付金额 + oilOrder.setDiscountAmount(Double.valueOf(discountAmount)); + oilOrder.setPayAmount(payAmount); + this.updateOilOrder(oilOrder); + return applet; } + @Autowired + CardValueChildOrderService cardValueChildOrderService; + + /** + * 添加储值卡子卡订单信息 + * @param userId 用户id + * @param storeId 店铺id + * @param orderNo 订单号 + * @param amount 订单金额 + * @param payStatus 支付状态 + * @param cardAmount 储值卡消费金额 + * @param payAmount 其他支付方式消费金额 + */ + private void insertCardOrder(Integer userId,Integer storeId,String orderNo,Double amount,String payStatus,Double cardAmount,Double payAmount){ + CardValueChildOrder cardValueChildOrder = new CardValueChildOrder(); + cardValueChildOrder.setUserId(userId); + cardValueChildOrder.setStoreId(storeId); + cardValueChildOrder.setOrderNo(orderNo); + cardValueChildOrder.setAmount(amount); + cardValueChildOrder.setStatus(payStatus); + cardValueChildOrder.setPayAmount(amount); + cardValueChildOrder.setRemark("储值卡消费"+cardAmount+"元，其他支付方式消费"+payAmount+"元"); + if ("paid".equals(payStatus)){ + cardValueChildOrder.setPayTime(new Date()); + } + cardValueChildOrderService.insertCardValueChildOrder(cardValueChildOrder); + } + + @Autowired + private CardValudChildrensService cardValudChildrensService; + @Override public int updateOrderStatus(String orderNo, String status) { int row = 0; OilOrder oilOrder = this.selectOilOrderByOrderNo(orderNo); + Integer userId = oilOrder.getUserId(); + LJUser user = userService.queryUserByUserId(userId); if (ObjectUtil.isNotEmpty(oilOrder)){ - oilOrder.setPayAmount(oilOrder.getOrderAmount()-oilOrder.getDiscountAmount()); +// oilOrder.setPayAmount(oilOrder.getOrderAmount()-oilOrder.getDiscountAmount()); oilOrder.setOrderStatus(status); if (status.equals("paid")){ oilOrder.setPayTime(new Date()); - this.updateGrowthValue(oilOrder.getPayAmount(),oilOrder.getUserId(), Integer.valueOf(oilOrder.getOils()),null,oilOrder.getStoreId()); + CardValueChildOrder cardValueChildOrder = cardValueChildOrderService.selectCardValueChildOrderByOrderNo(orderNo); + if (ObjectUtil.isNotEmpty(cardValueChildOrder)){ + cardValueChildOrder.setStatus("paid"); + cardValueChildOrder.setPayTime(new Date()); + cardValueChildOrderService.updateCardValueChildOrder(cardValueChildOrder); + +// 查询主卡信息 + CardValudChildrens cardValudChildrens = cardValudChildrensService.selectCardValueChildrenByMobileAndStoreId(user.getMobile(), oilOrder.getStoreId()); + userId = cardValudChildrens.getUserId(); + } + this.updateGrowthValue(oilOrder.getPayAmount(),userId, Integer.valueOf(oilOrder.getOils()),null,oilOrder.getStoreId()); CashierOrder cashierOrder = cashierOrderService.selectCashierOrder(orderNo); if (ObjectUtil.isNotEmpty(cashierOrder)){ cashierOrder.setPayTime(new Date()); cashierOrder.setStatus("paid"); + cashierOrder.setOilDiscountAmount(oilOrder.getDiscountAmount()); + cashierOrder.setPayAmount(oilOrder.getPayAmount()); cashierOrderService.updateCashierOrder(cashierOrder); } } @@ -955,8 +1031,14 @@ public class OilOrderServiceImpl extends ServiceImpl i } } + /** + * 修改余额信息 + * @param amount + * @param userId + * @param storeId + */ private void insertCardBalance(Double amount,Integer userId,Integer storeId){ - AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); +// AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); // 根据用户id查询用户余额信息 LJStore store = storeService.selectStoreByStoreId(storeId); UserBalance balance = userBalanceService.selectUserBalance(userId,store.getChainStoreId()); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/vo/CardValueChildOrderVo.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/vo/CardValueChildOrderVo.java new file mode 100644 index 000000000..a86ddfced --- /dev/null +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/vo/CardValueChildOrderVo.java @@ -0,0 +1,9 @@ +package com.fuint.business.order.vo; + +import com.fuint.business.order.entity.CardValueChildOrder; +import lombok.Data; + +@Data +public class CardValueChildOrderVo extends CardValueChildOrder { + private String cardChildPhones; +} diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/LJUserController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/LJUserController.java index b547f876b..ab59629dd 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/LJUserController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/controller/LJUserController.java @@ -115,13 +115,15 @@ public class LJUserController extends BaseController { /** * 根据storeId查询会员信息 - * @param storeId + * @param map * @return */ - @GetMapping("/storeUser/{storeId}") - public ResponseObject userVoInfo(@PathVariable Integer storeId){ - LJUserVo user = userService.queryUserByStoreId(storeId); - return getSuccessResult(user); + @PostMapping("/storeUser") + public ResponseObject userVoInfo(@RequestBody Map map){ + Integer storeId = Integer.valueOf(map.get("storeId")); + Integer userId = Integer.valueOf(map.get("userId")); + Map map1 = userService.queryUserByStoreId(storeId, userId); + return getSuccessResult(map1); } @GetMapping("/getByUniApp") diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/LJUserService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/LJUserService.java index cfbd733ec..9bf17e4cf 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/LJUserService.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/LJUserService.java @@ -58,7 +58,7 @@ public interface LJUserService extends IService { * @param storeId * @return */ - public LJUserVo queryUserByStoreId(int storeId); + public Map queryUserByStoreId(Integer storeId,Integer mobile); /** * 根据手机号和连锁店id查询会员信息 diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java index 8a32922ce..e85b6811b 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/service/impl/LJUserServiceImpl.java @@ -5,6 +5,8 @@ import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.fuint.business.marketingActivity.cardValueChildrens.entity.CardValudChildrens; +import com.fuint.business.marketingActivity.cardValueChildrens.service.CardValudChildrensService; import com.fuint.business.storeInformation.entity.LJStore; import com.fuint.business.storeInformation.service.ILJStoreService; import com.fuint.business.userManager.entity.*; @@ -20,6 +22,7 @@ import com.fuint.common.dto.AccountInfo; import com.fuint.common.util.StringUtils; import com.fuint.common.util.TokenUtil; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; import javax.annotation.Resource; @@ -130,11 +133,24 @@ public class LJUserServiceImpl extends ServiceImpl impleme return baseMapper.selectUserById(id); } + @Autowired + @Lazy + private CardValudChildrensService cardValudChildrensService; + @Override - public LJUserVo queryUserByStoreId(int storeId) { - AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + public Map queryUserByStoreId(Integer storeId,Integer userId) { + Map map = new HashMap<>(); + LJUser user = baseMapper.selectById(userId); + map.put("isUseChild","no"); + CardValudChildrens cardValudChildrens = cardValudChildrensService.selectCardValueChildrenByMobileAndStoreId(user.getMobile(), storeId); + if (ObjectUtil.isNotEmpty(cardValudChildrens)){ + userId = cardValudChildrens.getUserId(); + map.put("isUseChild","yes"); + } LJStore store = storeService.selectStoreByStoreId(storeId); - return baseMapper.queryUserByChainStoreId(nowAccountInfo.getId(),store.getChainStoreId()); + LJUserVo userVo = baseMapper.queryUserByChainStoreId(userId, store.getChainStoreId()); + map.put("userVo",userVo); + return map; } @Override diff --git a/gasStation-uni/pages/index/index.vue b/gasStation-uni/pages/index/index.vue index ea3ca8cd8..e8f166074 100644 --- a/gasStation-uni/pages/index/index.vue +++ b/gasStation-uni/pages/index/index.vue @@ -223,7 +223,7 @@ if (uni.getStorageSync("storeId")) { this.storeId = uni.getStorageSync("storeId") } else { - let storeId = "12"; + let storeId = "34"; uni.setStorageSync("storeId", storeId) } diff --git a/gasStation-uni/pages/my/my.vue b/gasStation-uni/pages/my/my.vue index 278fbb219..d2f8073c9 100644 --- a/gasStation-uni/pages/my/my.vue +++ b/gasStation-uni/pages/my/my.vue @@ -206,7 +206,7 @@ this.user = res.data uni.setStorageSync('userId', res.data.id) this.user.mobile = res.data.mobile.slice(0, 3) + "****" + res.data.mobile.slice(res.data - .mobile.length - 5, res.data.mobile.length - 1) + .mobile.length - 4, res.data.mobile.length) } }) }, diff --git a/gasStation-uni/pagesMy/CardManagement/CardManagement.vue b/gasStation-uni/pagesMy/CardManagement/CardManagement.vue index c12a6d51b..fc7f69264 100644 --- a/gasStation-uni/pagesMy/CardManagement/CardManagement.vue +++ b/gasStation-uni/pagesMy/CardManagement/CardManagement.vue @@ -30,30 +30,84 @@ --> - - - - {{store.name}}{{store.description ? "("+store.description+")" : ""}} - - 储值卡 - - - 子卡手机号 - {{item.cardChildPhones}} + + + + + {{store.name}}{{store.description ? "("+store.description+")" : ""}} - - 去完成 + 储值卡 + + + 子卡手机号 + {{item.cardChildPhones}} + + + 去完成 + - - - + + + + + + - - - + + + + + + {{store.name}} + + 已支付 + 支付失败 + 未支付 + + + + + 订单金额 + ￥{{item.amount}} + + + 支付金额 + ￥{{item.payAmount}} + + + 订单时间 + {{parseTime(item.payTime)}} + {{item.createTime}} + + + 订单备注 + {{item.remark}} + + + + + + + + + @@ -77,6 +131,15 @@ storeId: uni.getStorageSync("storeId"), // 店铺信息 store:{}, + scrollTop: 0, + orderList:[], + map:{ + page:1, + pageSize:10, + storeId: uni.getStorageSync("storeId"), + cardChildPhones:'', + }, + total:0, } }, onShow() { @@ -87,6 +150,46 @@ }, methods: { + // 查询当前子卡手机号消费信息 + toCheck(mobile){ + this.map.cardChildPhones = mobile; + this.map.page = 1; + this.getMyOrder() + this.tindex = 1; + }, + parseTime(dateTime) { + let date = new Date(dateTime); + let y = date.getFullYear() + "-"; + let mon = ((date.getMonth() + 1 < 10) ? ('0' + date.getMonth()) : date.getMonth()) + "-"; + let d = ((date.getDate() < 10) ? ('0' + date.getDate()) : date.getDate()) + " "; + let h = ((date.getHours() < 10) ? ('0' + date.getHours()) : date.getHours()) + ":"; + let m = ((date.getMinutes() < 10) ? ('0' + date.getMinutes()) : date.getMinutes()) + ":"; + let s = ((date.getSeconds() < 10) ? ('0' + date.getSeconds()) : date.getSeconds()); + return y + mon + d + h + m + s; + }, + // 滚动区域 + scrolltolower() { + if (this.orderList.length < this.total) { + this.map.page++; + this.getMyOrder() + } + }, + getMyOrder(){ + request({ + url: "business/order/cardValueChildOrder/list", + method: 'get', + params:this.map, + }).then((res) => { + if (res.code == 200) { + if (this.map.page == 1) { + this.orderList = res.data.records + } else { + this.orderList = _this.orderList.concat(res.data.records) + } + this.total = res.data.total + } + }) + }, // 获取当前店铺信息 getStore(){ request({ @@ -100,7 +203,7 @@ // 获取子卡信息 getCardValueChildren(){ request({ - url: "cardValudChildrens/list", + url: "cardValudChildrens/list/"+this.storeId, method: 'get', }).then((res) => { // console.log(res) @@ -109,6 +212,13 @@ }, tapindex(index) { this.tindex = index + console.log(index); + if (index==0){ + this.getCardValueChildren() + } + if (index==1){ + this.getMyOrder() + } }, goDetail() { uni.navigateTo({ @@ -259,4 +369,50 @@ justify-content: center; background-color: #0000ff; } + .box-order { + width: 95%; + border-radius: 8px; + background: #ffffff; + box-sizing: border-box; + padding: 10px; + margin: 10px auto; + } + + .or-box-top { + width: 100%; + display: flex; + align-items: center; + justify-content: space-between; + box-sizing: border-box; + padding: 5px 0px; + border-bottom: 1px solid #e5e5e5; + + } + + .chengg { + color: #1678ff; + } + .but-box { + width: 100%; + display: flex; + align-items: center; + justify-content: space-between; + font-size: 14px; + margin: 5px 0px; + } + + .reds { + color: red; + } + + .huis { + color: #666666; + } + + .end-box { + width: 100%; + display: flex; + align-items: center; + justify-content: flex-end; + } \ No newline at end of file diff --git a/gasStation-uni/pagesMy/CardManagement/Detail.vue b/gasStation-uni/pagesMy/CardManagement/Detail.vue index b0e9118b9..47162453a 100644 --- a/gasStation-uni/pagesMy/CardManagement/Detail.vue +++ b/gasStation-uni/pagesMy/CardManagement/Detail.vue @@ -30,6 +30,7 @@ title: '', cardValueChildrens:{ cardChildPhones:"", + storeId:uni.getStorageSync("storeId"), }, } }, @@ -40,6 +41,7 @@ methods: { // 添加子卡信息 submitCardValChildren(){ + console.log(this.cardValueChildrens); if(this.cardValueChildrens.cardChildPhones==""){ uni.showToast({ title:"请填写子卡手机号", @@ -59,8 +61,8 @@ method: 'post', data:this.cardValueChildrens, }).then((res) => { - console.log(res) - if (res.data.error != null && res.data.error != undefined && res.data.error != ""){ + // console.log(res) + if (res.data.error){ uni.showToast({ title:res.data.error, icon:"none" diff --git a/gasStation-uni/pagesRefuel/orderDetail/index.vue b/gasStation-uni/pagesRefuel/orderDetail/index.vue index c95101387..62fbfcd7c 100644 --- a/gasStation-uni/pagesRefuel/orderDetail/index.vue +++ b/gasStation-uni/pagesRefuel/orderDetail/index.vue @@ -51,7 +51,7 @@ 储值卡 - (余额：￥{{user.cardBalance}}) + (主卡余额：￥{{user.cardBalance}}) -￥{{balanceRedece}} @@ -195,11 +195,12 @@ storeId:uni.getStorageSync("storeId") }, fixingLevel:{}, + isUseChildCard:false, } }, onLoad(e) { this.orderNo = e.orderNo - // this.orderNo = "2345202401061730169a69d8" + // this.orderNo = "234520240109161930c1f4e6" }, onShow() { this.getOilOrder(); @@ -223,6 +224,7 @@ isOilStorageCard : this.isOilStorageCard, tankId : uni.getStorageSync("tankId"), // tankId : 6, + isUseChildCard:this.isUseChildCard, }; let _this = this; request({ @@ -668,26 +670,37 @@ } }) }, + // 查看是否有可使用的父卡储值余额 + chooseCardBalanceChild(){ + + }, // 计算用户应付金额 countPayMent(){ this.payAmount = this.deductAmount - this.gradeRedece - this.fullRedece - this.couponRedece; }, - // 根据用户id查询用户信息 + // 根据店铺id查询用户信息 getUser(id){ let _this = this; request({ - url: "business/userManager/user/storeUser/" + _this.oilOrder.storeId, - method: 'get', + url: "business/userManager/user/storeUser", + method: 'post', + data:{storeId:_this.oilOrder.storeId,userId:id} }).then((res) => { - _this.user = res.data; - if (res.data.refuelMoney!=null && res.data.refuelMoney!=""){ - _this.refuelMoney = JSON.parse(res.data.refuelMoney) + if (res.data.isUseChild){ + _this.isUseChildCard = true + }else{ + _this.isUseChildCard = false + } + _this.user = res.data.userVo; + _this.user = res.data.userVo; + if (res.data.userVo.refuelMoney!=null && res.data.userVo.refuelMoney!=""){ + _this.refuelMoney = JSON.parse(res.data.userVo.refuelMoney) _this.chooseRefuelMoney() }else{ _this.chooseCardBalance(0) - _this.chooseGrade(res.data.gradeId) + _this.chooseGrade(res.data.userVo.gradeId) } }) },