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:
zhaohengkun 2024-10-22 11:16:59 +08:00
parent e7b2df5001
commit 75f2c2b3ad
13 changed files with 2767 additions and 2620 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

95
fuintAdmin/src/api/integral/gift.js
View File

@ -2,54 +2,49 @@ import request from "@/utils/request";
// 查询油罐列表
export function getGiftApi(data) {
return request({
url: 'business/integral/integralGift/queryByPage',
method: 'get',
params: data
})
}
// 新增有关信息
export function insertGiftApi(data) {
return request({
url: 'business/integral/integralGift',
method: 'post',
data: data
})
}
// 修改有关信息
export function updateGiftApi(data) {
return request({
url: 'business/integral/integralGift',
method: 'put',
data: data
})
}
return request({
url: 'business/integral/integralGift/queryByPage',
method: 'get',
params: data
})
}
// 新增有关信息
export function insertGiftApi(data) {
return request({
url: 'business/integral/integralGift',
method: 'post',
data: data
})
}
// 修改有关信息
export function updateGiftApi(data) {
return request({
url: 'business/integral/integralGift',
method: 'put',
data: data
})
}
// 修改库存
export function updateGiftInventoryApi(data) {
return request({
url: 'business/integral/integralGift/updateInventory',
method: 'get',
params: data
})
}
//获取全部 剩余数量 >0 的优惠券
export function getCardCoupon(data) {
return request({
url: 'cardCoupon/queryByNum',
method: 'get',
params: data
})
}
// 修改库存
export function updateGiftInventoryApi(data) {
return request({
url: 'business/integral/integralGift/updateInventory',
method: 'get',
params: data
})
}
//兑换券
export function getCardFavorableApi(data) {
return request({
url: 'business/marketingActivity/cardFavorable?pageNo=1&pageSize=10',
method: 'get',
params: data
})
}
//优惠券
export function getCardExchangeApi(data) {
return request({
url: 'business/marketingActivity/cardExchange?pageNo=1&pageSize=10',
method: 'get',
params: data
})
}

894
fuintAdmin/src/views/integral/gift/add.vue
View File

File diff suppressed because it is too large Load Diff

51
fuintAdmin/src/views/integral/gift/gift.vue
View File

@ -142,10 +142,11 @@
</template>
</el-table-column>
</el-table>
<!-- 分页 -->
<pagination
v-show="total>0"
:total="total"
:page.sync="queryParams.page"
:page.sync="queryParams.pageNo"
:limit.sync="queryParams.pageSize"
@pagination="getList"
/>
@ -652,8 +653,8 @@ export default {
queryParams: {
giftName: '',
status: '',
page:null,
pageSize:null
pageNo:1,
pageSize:10
},
dateRange:{},
// 遮罩层
@ -905,7 +906,7 @@ export default {
},
// 搜索按钮操作
handleQuery() {
this.queryParams.page = 1;
this.queryParams.pageNo = 1;
this.getList();
},
// 修改按钮
@ -919,48 +920,6 @@ export default {
}
});
//
// await this.cardFavorableApi();
// await this.cardExchangeApi();
// await this.selectGiftCategory();
//
// this.giftImages = []
// data.giftImages = JSON.parse(data.giftImages);
// data.giftImages.forEach(res=> {
// let newImage = {
// url: this.imagePath + res,
// fileName: res
// }
// this.giftImages.push(newImage);
// }),
//
// // data.deliveryMethod = JSON.parse(data.deliveryMethod);
//
// console.log("data",data)
// this.dataForm = data;
// this.changeGiftType(this.dataForm.giftType)
// this.changeExchange(this.dataForm.exchangeMethod)
// this.changeExpressEDIT()
//
//
// console.log(" this.dataForm", this.dataForm)
// this.title = '修改礼品'
//
// this.open = true;
// this.getList();
},
cardFavorableApi () {
getCardFavorableApi().then(res=>{
this.cardFavorableList = res.data.records
})
},
cardExchangeApi () {
getCardExchangeApi().then(res=>{
this.cardExchangeApiList =res.data.records
})
},
resetQuery() {

3
fuintBackend/fuint-application/src/main/java/com/fuint/business/integral/service/impl/IntegralGiftServiceImpl.java
View File

@ -68,7 +68,8 @@ public class IntegralGiftServiceImpl implements IntegralGiftService {
public IPage<IntegralGiftVO> queryByPage(@Param("page") Page page, @Param("integralGiftCategory") IntegralGift integralGift) {
AccountInfo nowAccountInfo = TokenUtil.getNowAccountInfo();
integralGift.setStoreId(nowAccountInfo.getStoreId());
return integralGiftDao.queryAllByLimit(page, integralGift);
IPage<IntegralGiftVO> integralGiftVOIPage = integralGiftDao.queryAllByLimit(page, integralGift);
return integralGiftVOIPage;
}

14
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/controller/CardCouponUserController.java
View File

@ -65,6 +65,7 @@ public class CardCouponUserController extends BaseController {
*/
@PostMapping
public ResponseObject insert(@RequestBody CardCouponUser cardCouponUser) {
return getSuccessResult(this.cardCouponUserService.save(cardCouponUser));
}
@ -97,5 +98,18 @@ public class CardCouponUserController extends BaseController {
Page page =new Page(pageNo,pageSize);
return getSuccessResult(cardCouponUserService.queryPage(page, cardCouponUserVo));
}
/**
* 根据 手机号 或 核销码 和 当前店铺id 以及 优惠券类型 兑换券 和 商品兑换券 来查询用户领取 并且 未核销的
* @param str 手机号 / 核销码
*/
@GetMapping ("selectUserCardVerification")
public ResponseObject selectUserCardVerification(String str,@RequestParam (name = "couponType", required = false, defaultValue = "1,2") Integer[] couponType) {
List<CardCouponUser> list = cardCouponUserService.selectUserCardVerification(str, couponType);
return getSuccessResult(list);
}
}

4
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/service/CardCouponUserService.java
View File

@ -59,5 +59,9 @@ public interface CardCouponUserService extends IService<CardCouponUser> {
* @return java.util.List<com.fuint.business.marketingActivity.cardCoupon.entity.CardCouponUser>
**/
List<CardCouponUser> selectListByUsed(Integer userId,List<Integer> couponIdList);
List<CardCouponUser> selectUserCardVerification(String str, Integer[] couponType);
}

5
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardCoupon/service/impl/CardCouponUserServiceImpl.java
View File

@ -171,5 +171,10 @@ public class CardCouponUserServiceImpl extends ServiceImpl<CardCouponUserMapper,
.eq(CardCouponUser::getStatus,"1");
return this.list(queryWrapper);
}
@Override
public List<CardCouponUser> selectUserCardVerification(String str, Integer[] couponType) {
return null;
}
}

2
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardExchange/service/impl/CardExchangeRecordServiceImpl.java
View File

@ -44,7 +44,7 @@ public class CardExchangeRecordServiceImpl extends ServiceImpl<CardExchangeRecor
*/
@Override
public IPage select(Page page, CardExchangeRecord cardExchangeRecord) {
//获取当前店铺的id和连锁店id
// 根据 手机号 或 核销码 和 当前店铺id 以及 优惠券类型 兑换券 和 商品兑换券 来查询用户领取 并且 未核销的
if (ObjectUtils.isNotEmpty(TokenUtil.getNowAccountInfo().getStoreId())) {
cardExchangeRecord.setStoreId(TokenUtil.getNowAccountInfo().getStoreId());
cardExchangeRecord.setChainStorId(storeService.getById(TokenUtil.getNowAccountInfo().getStoreId()).getChainStoreId());

4
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardGiftActive/entity/CardGiftActive.java
View File

@ -29,10 +29,10 @@ public class CardGiftActive extends Model<CardGiftActive> {
//礼品卡金额
private Double cardAmount;
//有效期开始时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
@JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
private Date effectiveTimeStart;
//有效期结束时间
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss" , timezone = "GMT+8")
@JsonFormat(pattern = "yyyy-MM-dd" , timezone = "GMT+8")
private Date effectiveTimeEnd;
//卡类型比如纸卡 使用数据字典 card_gift_type
private String cardType;

6
fuintBackend/fuint-application/src/main/java/com/fuint/business/order/service/impl/CreditUnitServiceImpl.java
View File

@ -122,9 +122,9 @@ public class CreditUnitServiceImpl extends ServiceImpl<CreditUnitMapper, CreditU
LJStore store = storeService.selectStoreByStoreId(nowAccountInfo.getStoreId());
creditUnit.setStoreId(store.getId());
creditUnit.setChainStoreId(store.getChainStoreId());
if (creditUnit.getStaffId()==null){
creditUnit.setStaffId(nowAccountInfo.getId());
}
// if (creditUnit.getStaffId()==null){
// creditUnit.setStaffId(nowAccountInfo.getId());
// }
// 查询挂账单位是否存在
QueryWrapper queryWrapper = new QueryWrapper<>();
queryWrapper.eq("unit_name",creditUnit.getUnitName());

840
fuintCashierWeb/src/views/cashier/NewComponents/Handover.vue
View File

File diff suppressed because it is too large Load Diff

3466
fuintCashierWeb/src/views/cashier/NewComponents/Integral.vue
View File

File diff suppressed because it is too large Load Diff

3
fuintCashierWeb/src/views/cashier/NewComponents/credit.vue
View File

@ -1040,6 +1040,7 @@ import {getLodop} from "@/api/LodopFuncs";
this.open1 = true
},
handleUpdate(data){
console.log("修改数据", data)
creditUnitInfo(data.id).then(res => {
this.form1 = res.data
this.title = "修改挂账单位"
@ -1068,7 +1069,7 @@ import {getLodop} from "@/api/LodopFuncs";
this.total3 = res.data.total;
})
this.getUnitStatistic(val)
this.getUnitStatistic(undefined)
},
getUnitStatistic(val){
if (val!=undefined){