diff --git a/fuintAdmin/src/api/staff/user/cardvaluechild.js b/fuintAdmin/src/api/staff/user/cardvaluechild.js new file mode 100644 index 000000000..4fce8f88c --- /dev/null +++ b/fuintAdmin/src/api/staff/user/cardvaluechild.js @@ -0,0 +1,45 @@ +import request from '@/utils/request' + +// 查询子卡信息列表 +export function listCardValueChild(id) { + return request({ + url: 'cardValudChildrens/listPC/'+id, + method: 'get', + }) +} + +// 根据id查询子卡信息 +export function cardValueChildInfo(id) { + return request({ + url: 'cardValudChildrens/'+id, + method: 'get', + }) +} + +// 添加子卡信息 +export function addCardValueChild(data) { + return request({ + url: 'cardValudChildrens', + method: 'post', + data: data, + }) +} + + +// 修改子卡信息 +export function editCardValueChild(data) { + return request({ + url: 'cardValudChildrens/edit', + method: 'put', + data: data, + }) +} + +// 查询子卡订单信息 +export function listCardValueChildOrder(query) { + return request({ + url: 'business/order/cardValueChildOrder/list', + method: 'get', + params:query, + }) +} diff --git a/fuintAdmin/src/views/member/userInfo.vue b/fuintAdmin/src/views/member/userInfo.vue index f69f40fd0..7e9855ba5 100644 --- a/fuintAdmin/src/views/member/userInfo.vue +++ b/fuintAdmin/src/views/member/userInfo.vue @@ -436,7 +436,7 @@ - + 手机号更换后,旧手机号将无法使用,更换后实时生效 @@ -536,101 +536,9 @@ - - - - -
-
会员信息：{{ form.mobile }}
- 新增子卡 -
-
- - - - - - - - - - - - - - - - - -
- - - - -
-
- - - - - - - - - - - - - - - 新增子卡 - - - - -
-
-
- - - - - - - - - - - -
- - - - + + + @@ -715,6 +623,7 @@ import pointsRecord from "@/views/member/userInfoOrder/pointsRecord.vue"; import couponList from "@/views/member/userInfoOrder/couponList.vue"; import growthValueRecord from "@/views/member/userInfoOrder/growthValueRecord.vue"; import refuelMoneyRecord from "@/views/member/userInfoOrder/refuelMoneyRecord.vue"; +import cardValueChild from "@/views/member/userInfoOrder/cardValueChild.vue"; import {allFixingLevel, getFixingLevel} from "@/api/staff/user/fixinglevel"; export default { @@ -727,6 +636,7 @@ export default { couponList, growthValueRecord, refuelMoneyRecord, + cardValueChild, }, computed: { item() { @@ -1012,6 +922,7 @@ export default { const commissionAmount = totalAmount.multipliedBy(percentageCommissions).dividedBy(100).decimalPlaces(2); this.cardValueForm.amountCommission = commissionAmount } + } }) } diff --git a/fuintAdmin/src/views/member/userInfoOrder/cardValueChild.vue b/fuintAdmin/src/views/member/userInfoOrder/cardValueChild.vue new file mode 100644 index 000000000..d931fb4e2 --- /dev/null +++ b/fuintAdmin/src/views/member/userInfoOrder/cardValueChild.vue @@ -0,0 +1,298 @@ + + + + + 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 46b0ab1ee..9515660f2 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 @@ -71,7 +71,26 @@ public class CardValudChildrensController extends BaseController { */ @GetMapping("/list/{storeId}") public ResponseObject list(@PathVariable Integer storeId){ - return getSuccessResult(cardValudChildrensService.selectCardValudChildrensByUserId(storeId)); + return getSuccessResult(cardValudChildrensService.selectCardValudChildrensByUserId(null,storeId)); + } + + /** + * 根据用户id查询子卡列表信息 + * @return + */ + @GetMapping("/listPC/{userId}") + public ResponseObject list1(@PathVariable Integer userId){ + return getSuccessResult(cardValudChildrensService.selectCardValudChildrensByUserIdAndStoreId(userId)); + } + + /** + * 修改子卡信息 + * @param cardValudChildrens + * @return + */ + @PutMapping("/edit") + public ResponseObject edit(@RequestBody CardValudChildrens cardValudChildrens){ + return getSuccessResult(cardValudChildrensService.edit(cardValudChildrens)); } /** 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 96e8c6e26..e29200057 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 @@ -22,10 +22,23 @@ public interface CardValudChildrensService extends IService Map add(CardValudChildrens cardValudChildrens); /** - * 查询当前用户的子卡信息 + * 修改数据 + * @param cardValudChildrens * @return */ - List selectCardValudChildrensByUserId(Integer storeId); + int edit(CardValudChildrens cardValudChildrens); + + /** + * 查询当前用户的子卡信息 小程序 + * @return + */ + List selectCardValudChildrensByUserId(Integer userId,Integer storeId); + + /** + * 查询当前用户的子卡信息 PC + * @return + */ + List selectCardValudChildrensByUserIdAndStoreId(Integer userId); /** * 根据店铺id和子卡手机号查询子卡信息 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 b5d7ffaaa..b31af868b 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 @@ -50,18 +50,26 @@ public class CardValudChildrensServiceImpl extends ServiceImpl add(CardValudChildrens cardValudChildrens) { AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + Integer storeId = cardValudChildrens.getStoreId(); + Integer userId = cardValudChildrens.getUserId(); + if (cardValudChildrens.getStoreId()==null){ + storeId = nowAccountInfo.getStoreId(); + } + if (cardValudChildrens.getUserId()==null){ + userId = nowAccountInfo.getId(); + } Map res = new HashMap<>(); if (ObjectUtils.isNotEmpty(cardValudChildrens)){ - LJUser user = userService.queryUserByUserId(nowAccountInfo.getId()); - LJStore store = storeService.selectStoreByStoreId(cardValudChildrens.getStoreId()); - UserBalance balance = userBalanceService.selectUserBalance(nowAccountInfo.getId(), store.getChainStoreId()); + LJUser user = userService.queryUserByUserId(userId); + LJStore store = storeService.selectStoreByStoreId(storeId); + UserBalance balance = userBalanceService.selectUserBalance(userId, store.getChainStoreId()); if (user.getMobile().equals(cardValudChildrens.getCardChildPhones())){ res.put("error","添加失败，子卡手机号不能与主卡手机号一样！"); return res; } cardValudChildrens.setCardValueId(balance.getId()); - List list = this.selectCardValudChildrensByUserId(cardValudChildrens.getStoreId()); + List list = this.selectCardValudChildrensByUserId(userId,storeId); if (list.size()>=2){ res.put("error","添加失败，最多只能添加两张子卡！"); return res; @@ -78,7 +86,8 @@ public class CardValudChildrensServiceImpl extends ServiceImpl selectCardValudChildrensByUserId(Integer storeId) { + public int edit(CardValudChildrens cardValudChildrens) { + int row = 0; + boolean flag = false; + String mobile = ""; + List list = this.selectCardValudChildrensByUserId(cardValudChildrens.getUserId(),cardValudChildrens.getStoreId()); + for (CardValudChildrens valudChildrens : list) { + if (cardValudChildrens.getCardChildPhones().equals(valudChildrens.getCardChildPhones())){ + if (cardValudChildrens.getId()!=valudChildrens.getId()){ + flag = true; + } + } + if (cardValudChildrens.getId()==valudChildrens.getId()){ + mobile = valudChildrens.getCardChildPhones(); + } + } + if (flag){ + row = 0; + return row; + } + LJUser user = userService.selectUserByMobile(mobile); + if (ObjectUtils.isNotEmpty(user)){ + user.setMobile(cardValudChildrens.getCardChildPhones()); + userService.updateById(user); + } + row = baseMapper.updateById(cardValudChildrens); + return row; + } + + @Override + public List selectCardValudChildrensByUserId(Integer userId,Integer storeId) { AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + if (userId==null){ + userId = nowAccountInfo.getId(); + } + if (storeId==null){ + storeId = nowAccountInfo.getStoreId(); + } LJStore store = storeService.selectStoreByStoreId(storeId); - UserBalance balance = userBalanceService.selectUserBalance(nowAccountInfo.getId(), store.getChainStoreId()); + UserBalance balance = userBalanceService.selectUserBalance(userId, store.getChainStoreId()); List list = null; if (ObjectUtils.isNotEmpty(balance)){ QueryWrapper queryWrapper = new QueryWrapper<>(); @@ -101,6 +145,21 @@ public class CardValudChildrensServiceImpl extends ServiceImpl selectCardValudChildrensByUserIdAndStoreId(Integer userId) { + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + LJStore store = storeService.selectStoreByStoreId(nowAccountInfo.getStoreId()); + UserBalance balance = userBalanceService.selectUserBalance(userId, store.getChainStoreId()); + List list = null; + if (ObjectUtils.isNotEmpty(balance)){ + QueryWrapper queryWrapper = new QueryWrapper<>(); + queryWrapper.eq("card_value_id",balance.getId()); + queryWrapper.eq("store_id",nowAccountInfo.getStoreId()); + list = baseMapper.selectList(queryWrapper); + } + return list; + } + @Override public CardValudChildrens selectCardValueChildrenByMobileAndStoreId(String mobile, Integer storeId) { QueryWrapper queryWrapper = new QueryWrapper<>(); 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 index 4ade49efb..7266d8b86 100644 --- 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 @@ -14,6 +14,8 @@ 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 com.fuint.common.dto.AccountInfo; +import com.fuint.common.util.TokenUtil; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -28,6 +30,10 @@ public class CardValueChildOrderServiceImpl extends ServiceImpl selectCardValueChildOrderList(Page page, CardValueChildOrderVo cardValueChildOrderVo) { + if (cardValueChildOrderVo.getStoreId()==null){ + AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo(); + cardValueChildOrderVo.setStoreId(nowAccountInfo.getStoreId()); + } return baseMapper.selectCardValueChildOrderList(page,cardValueChildOrderVo); } diff --git a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/entity/LJUserGrade.java b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/entity/LJUserGrade.java index e7c3b7d81..ce3d624b8 100644 --- a/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/entity/LJUserGrade.java +++ b/fuintBackend/fuint-application/src/main/java/com/fuint/business/userManager/entity/LJUserGrade.java @@ -33,6 +33,9 @@ public class LJUserGrade extends BaseEntity implements Serializable { @TableId(value = "ID", type = IdType.AUTO) private Integer id; + @ApiModelProperty("连锁店ID") + private Integer chainStoreId; + @ApiModelProperty("店铺ID") private Integer storeId; diff --git a/gasStation-uni/pagesRefuel/orderDetail/index.vue b/gasStation-uni/pagesRefuel/orderDetail/index.vue index 1938d284a..5a537442e 100644 --- a/gasStation-uni/pagesRefuel/orderDetail/index.vue +++ b/gasStation-uni/pagesRefuel/orderDetail/index.vue @@ -691,6 +691,7 @@ } _this.user = res.data.userVo; _this.user = res.data.userVo; + console.log(res.data.userVo.refuelMoney); if (res.data.userVo.refuelMoney!=null && res.data.userVo.refuelMoney!=""){ _this.refuelMoney = JSON.parse(res.data.userVo.refuelMoney) _this.chooseRefuelMoney()