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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
@QQNZX 2023-12-09 09:17:39 +08:00
commit a692fcdeb1
7 changed files with 98 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/controller/CardValueRecordController.java
View File

@ -128,6 +128,21 @@ public class CardValueRecordController extends BaseController {
return getSuccessResult(this.cardValueRecordService.selectCardRecord(page, cardValueRecord));
}
/**
* 查询用户的囤油充值记录
* @param pageNo
* @param pageSize
* @param cardValueRecord
* @return
*/
@GetMapping("selectFuleRecord")
public ResponseObject selectFuleRecord(@RequestParam(value = "pageNo",defaultValue = "1") Integer pageNo,
@RequestParam(value = "pageSize",defaultValue = "10") Integer pageSize,
@Param("cardValueRecord") CardValueRecordDTO cardValueRecord) {
Page page = new Page(pageNo, pageSize);
return getSuccessResult(this.cardValueRecordService.selectFuleRecord(page, cardValueRecord));
}
/**
* 查询用户的储值充值记录 和囤油充值记录
* @param pageNo

1
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/CardValueRecordMapper.java
View File

@ -17,6 +17,7 @@ import org.apache.ibatis.annotations.Param;
public interface CardValueRecordMapper extends BaseMapper<CardValueRecord> {
IPage<CardValueRecordDTO> selectCardRecord(@Param("page") Page page,@Param("cardValueRecord") CardValueRecordDTO cardValueRecord);
IPage<CardValueRecordDTO> selectFuleRecord(@Param("page") Page page,@Param("cardValueRecord") CardValueRecordDTO cardValueRecord);
IPage<CardValueRecordDTO> selectAllRecord(@Param("page") Page page, @Param("cardValueRecord") CardValueRecordDTO cardValueRecord);

26
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/mapper/xml/CardValueRecordMapper.xml
View File

@ -28,6 +28,32 @@
ORDER BY createTime
</select>
<select id="selectFuleRecord"
resultType="com.fuint.business.marketingActivity.cardValue.dto.CardValueRecordDTO">
SELECT
'升数卡' AS recordName,
mt_user_id mtUserId,
recharge_balance rechargeBalance,
income_litres obtain,
create_time createTime,
chain_store_id chainStoreId,
store_id storeId
FROM
card_fuel_record
<where>
<if test="cardValueRecord.mtUserId != null">
and combined_result.mtUserId = #{cardValueRecord.mtUserId}
</if>
<if test="cardValueRecord.storeId != null">
and combined_result.storeId = #{cardValueRecord.storeId}
</if>
<if test="cardValueRecord.recordName != null">
and combined_result.recordName = #{cardValueRecord.recordName}
</if>
</where>
ORDER BY createTime
</select>
<select id="selectAllRecord"
resultType="com.fuint.business.marketingActivity.cardValue.dto.CardValueRecordDTO">

1
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/CardValueRecordService.java
View File

@ -40,6 +40,7 @@ public interface CardValueRecordService extends IService<CardValueRecord> {
IPage<CardValueRecordDTO> selectCardRecord(@Param("page") Page page, CardValueRecordDTO cardValueRecord);
IPage<CardValueRecordDTO> selectFuleRecord(@Param("page") Page page, CardValueRecordDTO cardValueRecord);
IPage<CardValueRecordDTO> selectAllRecord(@Param("page") Page page, CardValueRecordDTO cardValueRecord);

11
fuintBackend/fuint-application/src/main/java/com/fuint/business/marketingActivity/cardValue/service/impl/CardValueRecordServiceImpl.java
View File

@ -288,11 +288,22 @@ public class CardValueRecordServiceImpl extends ServiceImpl<CardValueRecordMappe
@Override
public IPage<CardValueRecordDTO> selectCardRecord(@Param("page") Page page, CardValueRecordDTO cardValueRecord) {
cardValueRecord.setStoreId(TokenUtil.getNowAccountInfo().getStoreId());
cardValueRecord.setMtUserId(TokenUtil.getNowAccountInfo().getId());
return this.cardValueRecordMapper.selectCardRecord(page, cardValueRecord);
}
@Override
public IPage<CardValueRecordDTO> selectFuleRecord(@Param("page") Page page, CardValueRecordDTO cardValueRecord) {
cardValueRecord.setStoreId(TokenUtil.getNowAccountInfo().getStoreId());
cardValueRecord.setMtUserId(TokenUtil.getNowAccountInfo().getId());
return this.cardValueRecordMapper.selectFuleRecord(page, cardValueRecord);
}
@Override
public IPage<CardValueRecordDTO> selectAllRecord(@Param("page") Page page, CardValueRecordDTO cardValueRecord) {
cardValueRecord.setStoreId(TokenUtil.getNowAccountInfo().getStoreId());
cardValueRecord.setMtUserId(TokenUtil.getNowAccountInfo().getId());
return this.cardValueRecordMapper.selectAllRecord(page, cardValueRecord);
}

6
gasStation-uni/pagesHome/order/order.vue
View File

@ -111,14 +111,14 @@
<script>
import config from '@/config'
import request from '../../utils/request'
import BigNumber from 'bignumber.js';
/* import BigNumber from 'bignumber.js'; */
export default {
data() {
return {
myPoints: 0, //我的积分
myPoints: 0, //我的积分
goodsInfo: '',
storeName: '',
storeAddress: '',
@ -557,4 +557,4 @@
border-radius: 4px;
background: #1678ff;
}
</style>
</style>

42
gasStation-uni/pagesMy/Recharge/Recharge.vue
View File

@ -141,6 +141,46 @@
}
})
},
// 查询储值卡充值订单
getCarOrderList() {
request({
url: 'business/marketingActivity/cardValueRecord/selectCardRecord',
method: 'get',
params: this.query
}).then((res) => {
if (res.code == 200) {
if (this.pageNo != 1) {
this.list = this.list.concat(res.data.records)
} else {
this.list = res.data.records
}
this.totalDetail = res.data.total
this.show = false
uni.hideLoading();
}
})
},
// 查询囤油卡充值订单
getFuleOrderList() {
request({
url: 'business/marketingActivity/cardValueRecord/selectFuleRecord',
method: 'get',
params: this.query
}).then((res) => {
if (res.code == 200) {
if (this.pageNo != 1) {
this.list = this.list.concat(res.data.records)
} else {
this.list = res.data.records
}
this.totalDetail = res.data.total
this.show = false
uni.hideLoading();
}
})
},
}
}
@ -270,4 +310,4 @@
font-size: 14px;
border-radius: 15px;
}
</style>
</style>