diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java index 6b8c25c9c..a33272cad 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/api/fuyou/service/impl/FyPayServiceImpl.java @@ -125,7 +125,7 @@ public class FyPayServiceImpl implements FyPayService { @Override public Map queryOrder(Map map1) throws Exception { - AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); +// AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); Map resMap =new HashMap<>(); resMap.put("msg","error"); try { @@ -140,6 +140,7 @@ public class FyPayServiceImpl implements FyPayService { map.put("ins_cd", insCd); map.put("mchnt_cd", mchntCd); + Integer storeId1 = Integer.valueOf(map1.get("storeId")); // 余额新增 String type = ""; String payStates=""; @@ -160,7 +161,7 @@ public class FyPayServiceImpl implements FyPayService { List list = oilOrderService.selectOilOrder(orderNo); LJOrder goodsOrder = goodsOrderService.selectGoodsOrder(orderNo); CashierOrder cashierOrder = cashierOrderService.selectCashierOrder(orderNo); - MerchantConfig merchantConfig = merchantConfigService.selectMeChByIdIsUse(nowAccountInfo.getStoreId()); + MerchantConfig merchantConfig = merchantConfigService.selectMeChByIdIsUse(storeId1); List returnRecords = returnRecordService.selectReturnRecordByOrderNo(orderNo); Date date = new Date(); if (reqMap.get("trans_stat").equals("SUCCESS")){ diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java index 15287e0b4..e58fc02d2 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardFule/service/impl/CardFuelRecordServiceImpl.java @@ -193,6 +193,7 @@ public class CardFuelRecordServiceImpl implements CardFuelRecordService { map.put("privateKey", merchantConfig.getPrivateKey()); map.put("type", "CFR"); map.put("orderId", cardFuelRecordDTO.getId().toString()); + map.put("storeId", nowAccountInfo.getStoreId().toString()); // 调用支付接口 try { fyPayService.pay(map); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/CardValueRecordService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/CardValueRecordService.java index 911fc0557..5bfe29fef 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/CardValueRecordService.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/CardValueRecordService.java @@ -58,4 +58,10 @@ public interface CardValueRecordService extends IService { void export(HttpServletResponse response, CardValueRecord cardValueRecord); void rechargeFinallDeal(String orderNo); + + /** + * 根据用户id查询当前的储值卡信息 + * @return + */ + CardValueRecord selectCardValueRecordByUserId(); } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java index c1b3e2093..a1d83f195 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java @@ -3,6 +3,7 @@ package com.fuint.business.marketingActivity.cardValue.service.impl; import cn.hutool.core.util.ObjectUtil; import com.alibaba.excel.EasyExcel; import com.alibaba.fastjson.JSONObject; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.toolkit.CollectionUtils; import com.baomidou.mybatisplus.extension.plugins.pagination.Page; @@ -327,6 +328,7 @@ public class CardValueRecordServiceImpl extends ServiceImpl(); + queryWrapper.eq("mt_user_id",nowAccountInfo.getId()); + queryWrapper.last("LIMIT 1"); + return baseMapper.selectOne(queryWrapper); + } +} diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueChildrens/controller/CardValudChildrensController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueChildrens/controller/CardValudChildrensController.java index 65497a445..f914ac3dc 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueChildrens/controller/CardValudChildrensController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueChildrens/controller/CardValudChildrensController.java @@ -56,7 +56,7 @@ public class CardValudChildrensController extends BaseController { /** * 新增数据 - * + * 新增子卡信息 * @param cardValudChildrens 实体对象 * @return 新增结果 */ @@ -65,6 +65,15 @@ public class CardValudChildrensController extends BaseController { return getSuccessResult(this.cardValudChildrensService.add(cardValudChildrens)); } + /** + * 根据用户id查询子卡列表信息 + * @return + */ + @GetMapping("/list") + public ResponseObject list(){ + return getSuccessResult(cardValudChildrensService.selectCardValudChildrensByUserId()); + } + /** * 修改数据 * diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueChildrens/service/CardValudChildrensService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueChildrens/service/CardValudChildrensService.java index 11c9eac6d..46347a5f7 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueChildrens/service/CardValudChildrensService.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueChildrens/service/CardValudChildrensService.java @@ -3,6 +3,9 @@ package com.fuint.business.marketingActivity.cardValueChildrens.service; import com.baomidou.mybatisplus.extension.service.IService; import com.fuint.business.marketingActivity.cardValueChildrens.entity.CardValudChildrens; +import java.util.List; +import java.util.Map; + /** * 子卡表(CardValudChildrens)表服务接口 * @@ -16,6 +19,12 @@ public interface CardValudChildrensService extends IService * @param cardValudChildrens * @return */ - boolean add(CardValudChildrens cardValudChildrens); + Map add(CardValudChildrens cardValudChildrens); + + /** + * 查询当前用户的子卡信息 + * @return + */ + List selectCardValudChildrensByUserId(); } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueChildrens/service/impl/CardValudChildrensServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueChildrens/service/impl/CardValudChildrensServiceImpl.java index 94c2a912b..6f85595b2 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueChildrens/service/impl/CardValudChildrensServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValueChildrens/service/impl/CardValudChildrensServiceImpl.java @@ -1,14 +1,21 @@ package com.fuint.business.marketingActivity.cardValueChildrens.service.impl; +import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; +import com.fuint.business.marketingActivity.cardValue.entity.CardValueRecord; +import com.fuint.business.marketingActivity.cardValue.service.CardValueRecordService; import com.fuint.business.marketingActivity.cardValue.service.CardValueService; import com.fuint.business.marketingActivity.cardValueChildrens.mapper.CardValudChildrensMapper; import com.fuint.business.marketingActivity.cardValueChildrens.entity.CardValudChildrens; import com.fuint.business.marketingActivity.cardValueChildrens.service.CardValudChildrensService; import org.apache.commons.lang3.ObjectUtils; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import javax.annotation.Resource; +import java.util.HashMap; +import java.util.List; +import java.util.Map; /** * 子卡表(CardValudChildrens)表服务实现类 @@ -18,20 +25,63 @@ import javax.annotation.Resource; */ @Service("cardValudChildrensService") public class CardValudChildrensServiceImpl extends ServiceImpl implements CardValudChildrensService { - + @Autowired + private CardValueRecordService cardValueRecordService; @Resource private CardValueService cardValueService; + /** * 新增数据 * @param cardValudChildrens * @return */ @Override - public boolean add(CardValudChildrens cardValudChildrens) { + public Map add(CardValudChildrens cardValudChildrens) { + Map res = new HashMap<>(); if (ObjectUtils.isNotEmpty(cardValudChildrens)){ + CardValueRecord cardValueRecord = cardValueRecordService.selectCardValueRecordByUserId(); + if (ObjectUtils.isNotEmpty(cardValudChildrens)){ + if (cardValueRecord.getMobile().equals(cardValudChildrens.getCardChildPhones())){ + res.put("error","添加失败，子卡手机号不能与主卡手机号一样！"); + return res; + } + cardValudChildrens.setCardValueId(cardValueRecord.getCardValueId()); + List list = this.selectCardValudChildrensByUserId(); + if (list.size()>=2){ + res.put("error","添加失败，最多只能添加两张子卡！"); + return res; + }else { + boolean flag = false; + if (list.size() > 0) { + for (CardValudChildrens childrens : list) { + if (childrens.getCardChildPhones().equals(cardValudChildrens)) { + flag = true; + } + } + } + if (flag) { + res.put("error", "添加失败，此手机号已存在！"); + return res; + } + baseMapper.insert(cardValudChildrens); + res.put("success", "添加成功！"); + } + } } - return false; + return res; + } + + @Override + public List selectCardValudChildrensByUserId() { + CardValueRecord cardValueRecord = cardValueRecordService.selectCardValueRecordByUserId(); + List list = null; + if (ObjectUtils.isNotEmpty(cardValueRecord)){ + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("card_value_id",cardValueRecord.getCardValueId()); + list = baseMapper.selectList(queryWrapper); + } + return list; } } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/CashierOrderController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/CashierOrderController.java index db15da2d4..31681be4a 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/CashierOrderController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/controller/CashierOrderController.java @@ -7,9 +7,11 @@ import com.fuint.business.order.service.CashierOrderService; import com.fuint.framework.web.BaseController; import com.fuint.framework.web.ResponseObject; import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; import org.springframework.web.bind.annotation.*; import javax.servlet.http.HttpServletResponse; +import java.util.Map; /** * 收银员订单信息 controller层 @@ -55,4 +57,10 @@ public class CashierOrderController extends BaseController { CashierOrder cashierOrder = cashierOrderService.queryCashierOrder(id); return getSuccessResult(cashierOrder); } + + @PostMapping("/orderNo") + public ResponseObject cashierOrderByOrderNo(@Validated @RequestBody Map map){ + String orderNo = map.get("orderNo"); + return getSuccessResult(cashierOrderService.selectCashierOrder(orderNo)); + } } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/HangBillServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/HangBillServiceImpl.java index 7105f945a..288769aff 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/HangBillServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/HangBillServiceImpl.java @@ -234,7 +234,7 @@ public class HangBillServiceImpl extends ServiceImpl i * 调用支付接口 * @param map */ - private void pay(Map map,String orderNo,int storeId){ + private void pay(Map map,String orderNo,Integer storeId){ // 先将支付状态改为未支付 String payType = map.get("payType"); if (!map.get("repaidAmount").equals("0") && !payType.equals("CASH")){ @@ -257,6 +257,7 @@ public class HangBillServiceImpl extends ServiceImpl i map1.put("goodsDes",merchantConfig.getMerchantName()); map1.put("publicKey",merchantConfig.getPublicKey()); map1.put("privateKey",merchantConfig.getPrivateKey()); + map1.put("storeId",storeId.toString()); try { fyPayService.pay(map1); }catch (Exception e){ 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 7f4151cee..600ba455e 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 @@ -374,6 +374,7 @@ public class OilOrderServiceImpl extends ServiceImpl i map1.put("goodsOrder",map.get("goodsOrder")); map1.put("oilOrder",map.get("oilOrder")); map1.put("tankId",map.get("oilOrder")); + map1.put("storeId",storeId.toString()); // 调用支付接口 try { diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/controller/LJStoreController.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/controller/LJStoreController.java index 19579f2d8..7e84f9282 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/controller/LJStoreController.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/controller/LJStoreController.java @@ -28,6 +28,15 @@ public class LJStoreController extends BaseController { return getSuccessResult(store); } + /** + * 根据id查询门店信息 + * @return + */ + @GetMapping("/{id}") + public ResponseObject queryStoreById(@PathVariable Integer id){ + return getSuccessResult(storeService.queryStoreById(id)); + } + @GetMapping("storeInfoUni") public ResponseObject storeInfoUni(Integer storeId){ LJStore store = storeService.selectStoreByIdUni(storeId); diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/service/ILJStoreService.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/service/ILJStoreService.java index 4ec2a42e9..b38cf9b2a 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/service/ILJStoreService.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/service/ILJStoreService.java @@ -17,6 +17,12 @@ public interface ILJStoreService extends IService { */ public LJStore selectStoreById(); + /** + * 根据id查询店铺信息 + * @return + */ + public LJStore queryStoreById(int id); + public LJStore selectStoreByIdUni(Integer storeId); /** diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/service/impl/LJStoreServiceImpl.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/service/impl/LJStoreServiceImpl.java index 9c938f5c4..09efe1eb6 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/service/impl/LJStoreServiceImpl.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/storeInformation/service/impl/LJStoreServiceImpl.java @@ -35,6 +35,11 @@ public class LJStoreServiceImpl extends ServiceImpl impl return store; } + @Override + public LJStore queryStoreById(int id) { + return baseMapper.selectById(id); + } + /** * 根据id查询店铺信息(小程序) * @return diff --git a/fuintCashierWeb/src/api/cashier/cashierorder.js b/fuintCashierWeb/src/api/cashier/cashierorder.js index fbcc672d3..cf5850c8e 100644 --- a/fuintCashierWeb/src/api/cashier/cashierorder.js +++ b/fuintCashierWeb/src/api/cashier/cashierorder.js @@ -16,3 +16,12 @@ export function cashierOrder(id) { method: 'get', }) } + +// 根据订单号查询油品订单信息 +export function cashierOrderByOrderNo(data) { + return request({ + url: '/business/oilOrder/orderNo', + method: 'post', + data: data + }) +} diff --git a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue index 784b168e7..f230f5f0f 100644 --- a/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue +++ b/fuintCashierWeb/src/views/cashier/NewComponents/homeindex.vue @@ -797,6 +797,7 @@ import {addHangBill} from "@/api/cashier/hangbill"; import {addCreditUnit, listCreditUnit} from "@/api/cashier/creditunit"; import {getSysConfig} from "@/api/staff/user/sysconfig"; + import {cashierOrderByOrderNo} from "@/api/cashier/cashierorder"; const cityOptions = ['上海', '北京']; export default { @@ -2331,6 +2332,7 @@ }) this.loading = true; _this.queryPayStatus(); + // console.log(_this.isQuery) let timer = setInterval(function () { if (_this.isQuery == false) { _this.loading = false; @@ -2420,7 +2422,8 @@ queryPayStatus(){ let _this = this; _this.timer = setInterval(function (){ - oilOrder({orderNo:_this.orderNo}).then( response => { + // "234520231228115544f073f4" + cashierOrderByOrderNo({orderNo:_this.orderNo}).then( response => { if (response.data!=null){ if (response.data.orderStatus == "unpaid"){ _this.isQuery = true; diff --git a/gasStation-uni/pagesMy/CardManagement/CardManagement.vue b/gasStation-uni/pagesMy/CardManagement/CardManagement.vue index 657a1cc65..c12a6d51b 100644 --- a/gasStation-uni/pagesMy/CardManagement/CardManagement.vue +++ b/gasStation-uni/pagesMy/CardManagement/CardManagement.vue @@ -14,12 +14,12 @@ - + + + + + {{store.name}}{{store.description ? "("+store.description+")" : ""}} + + 储值卡 + + + 子卡手机号 + {{item.cardChildPhones}} + + + 去完成 + + - +