bug
This commit is contained in:
parent
dd535ad374
commit
b3a1c3df30
@ -49,7 +49,7 @@
|
||||
<el-select
|
||||
v-model="queryParams.gradeId"
|
||||
clearable
|
||||
placeholder="全部"
|
||||
placeholder="会员等级"
|
||||
>
|
||||
<el-option v-for="grade in userGradeList" :key="grade.id+''" :label="grade.name" :value="grade.id+''"/>
|
||||
</el-select>
|
||||
@ -58,7 +58,7 @@
|
||||
<el-select
|
||||
v-model="ifBalance"
|
||||
clearable
|
||||
placeholder="全部"
|
||||
placeholder="有无储值余额"
|
||||
>
|
||||
<el-option label="有储值余额" value="haveBalance"/>
|
||||
<el-option label="无储值余额" value="noHaveBalance"/>
|
||||
|
||||
@ -8,3 +8,12 @@ export function storeTotalIndex(query) {
|
||||
params: query
|
||||
})
|
||||
}
|
||||
|
||||
// 查询首页店铺金额信息
|
||||
export function storeAmountIndex(query) {
|
||||
return request({
|
||||
url: '/business/allOrderInfo/getAmount',
|
||||
method: 'get',
|
||||
params: query
|
||||
})
|
||||
}
|
||||
|
||||
@ -152,7 +152,7 @@
|
||||
|
||||
<script>
|
||||
import echarts from "echarts";
|
||||
import {storeTotalIndex} from "@/api/indexBanner";
|
||||
import {storeAmountIndex, storeTotalIndex} from "@/api/indexBanner";
|
||||
export default {
|
||||
|
||||
data(){
|
||||
@ -186,10 +186,13 @@ export default {
|
||||
imagePath: process.env.VUE_APP_SERVER_URL,
|
||||
// 店铺数量
|
||||
storeTotal:{},
|
||||
// 店铺金额
|
||||
storeAmount:{},
|
||||
}
|
||||
},
|
||||
created() {
|
||||
this.getStoreTotal()
|
||||
this.getStoreAmount()
|
||||
},
|
||||
mounted() {
|
||||
this.initChart()
|
||||
@ -200,6 +203,11 @@ export default {
|
||||
this.storeTotal = res.data
|
||||
})
|
||||
},
|
||||
getStoreAmount(){
|
||||
storeAmountIndex().then(res => {
|
||||
console.log(res)
|
||||
})
|
||||
},
|
||||
initChart() {
|
||||
const chart = echarts.init(document.getElementById('ccc'))
|
||||
const chart1 = echarts.init(document.getElementById('cccc'))
|
||||
|
||||
@ -1001,15 +1001,19 @@ public class AllOrderInfoServiceImpl extends ServiceImpl<AllOrderInfoMapper,AllO
|
||||
Double averagePrice = tradeAmount/tradeTotal;
|
||||
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
|
||||
|
||||
LocalDate date1 = LocalDate.parse(allOrderInfoVo.getParams().get("beginTime").toString(), formatter);
|
||||
LocalDate date2 = LocalDate.parse(allOrderInfoVo.getParams().get("endTime").toString(), formatter);
|
||||
|
||||
Integer daysBetween = Math.toIntExact(ChronoUnit.DAYS.between(date1, date2));
|
||||
Double dayTradeAmount = tradeAmount/daysBetween;
|
||||
Integer dayTradeTotal = tradeTotal/daysBetween;
|
||||
Double dayTradeAmount = 0.0;
|
||||
Integer dayTradeTotal = 0;
|
||||
Map<String, String> map1 = new HashMap<>();
|
||||
map1.put("startTime",allOrderInfoVo.getParams().get("beginTime").toString());
|
||||
map1.put("endTime",allOrderInfoVo.getParams().get("endTime").toString());
|
||||
if (ObjectUtil.isNotEmpty(allOrderInfoVo.getParams())) {
|
||||
LocalDate date1 = LocalDate.parse(allOrderInfoVo.getParams().get("beginTime").toString(), formatter);
|
||||
LocalDate date2 = LocalDate.parse(allOrderInfoVo.getParams().get("endTime").toString(), formatter);
|
||||
|
||||
Integer daysBetween = Math.toIntExact(ChronoUnit.DAYS.between(date1, date2));
|
||||
dayTradeAmount = tradeAmount / daysBetween;
|
||||
dayTradeTotal = tradeTotal / daysBetween;
|
||||
map1.put("startTime", allOrderInfoVo.getParams().get("beginTime").toString());
|
||||
map1.put("endTime", allOrderInfoVo.getParams().get("endTime").toString());
|
||||
}
|
||||
Integer storeTotal = selectStoreTotal(map1);
|
||||
|
||||
map.put("tradeTotal",tradeTotal);
|
||||
|
||||
@ -151,8 +151,11 @@ public class CertifiedMemberController extends BaseController {
|
||||
response.addHeader("Content-Disposition", "filename=" + filenames + ".xlsx");
|
||||
|
||||
CertifiedMemberVo certifiedMember = new CertifiedMemberVo();
|
||||
certifiedMember.setFixingLevelName("出租车认证");
|
||||
certifiedMember.setMobile("15487415241");
|
||||
certifiedMember.setFixingLevelName("出租车认证");
|
||||
certifiedMember.setName("张三");
|
||||
certifiedMember.setCarNumber("鲁A8888");
|
||||
certifiedMember.setRemark("这是一条示例数据");
|
||||
|
||||
List<CertifiedMemberVo> list = new ArrayList<>();
|
||||
list.add(certifiedMember);
|
||||
@ -191,6 +194,9 @@ public class CertifiedMemberController extends BaseController {
|
||||
CertifiedMember certifiedMember = new CertifiedMember();
|
||||
certifiedMember.setFixingLevelId(fixingLevel.getId());
|
||||
certifiedMember.setMobile(certifiedMemberVo.getMobile());
|
||||
certifiedMember.setName(certifiedMemberVo.getName());
|
||||
certifiedMember.setCarNumber(certifiedMemberVo.getCarNumber());
|
||||
certifiedMember.setRemark(certifiedMemberVo.getRemark());
|
||||
int row = certifiedMemberService.insertCertifiedMember(certifiedMember);
|
||||
if (row == 1) {
|
||||
success++;
|
||||
|
||||
@ -46,6 +46,7 @@ public class CertifiedMember extends BaseEntity implements Serializable {
|
||||
* 姓名
|
||||
*/
|
||||
@ApiModelProperty("姓名")
|
||||
@ExcelProperty(value = "姓名")
|
||||
private String name;
|
||||
/**
|
||||
* 手机号
|
||||
@ -57,6 +58,7 @@ public class CertifiedMember extends BaseEntity implements Serializable {
|
||||
* 车牌号
|
||||
*/
|
||||
@ApiModelProperty("车牌号")
|
||||
@ExcelProperty(value = "车牌号")
|
||||
private String carNumber;
|
||||
/**
|
||||
* 认证资料
|
||||
@ -67,6 +69,7 @@ public class CertifiedMember extends BaseEntity implements Serializable {
|
||||
* 备注
|
||||
*/
|
||||
@ApiModelProperty("备注")
|
||||
@ExcelProperty(value = "备注")
|
||||
private String remark;
|
||||
/**
|
||||
* 认证状态
|
||||
|
||||
@ -73,7 +73,7 @@ public class LJUserServiceImpl extends ServiceImpl<LJUserMapper, LJUser> impleme
|
||||
|
||||
/**
|
||||
* 根据条件分页查询会员信息
|
||||
* @param page
|
||||
* @param
|
||||
* @param user
|
||||
* @return
|
||||
*/
|
||||
|
||||
@ -8,6 +8,6 @@ import lombok.Data;
|
||||
@Data
|
||||
@ExcelIgnoreUnannotated
|
||||
public class CertifiedMemberVo extends CertifiedMember {
|
||||
@ExcelProperty(value = "固定等级名称")
|
||||
@ExcelProperty(value = "认证类型")
|
||||
private String fixingLevelName;
|
||||
}
|
||||
|
||||
@ -160,6 +160,7 @@ public class DutyServiceImpl extends ServiceImpl<TDutyMapper, TDuty> implements
|
||||
TDutySource dutySource = new TDutySource();
|
||||
dutySource.setDutyId(tduty.getDutyId());
|
||||
dutySource.setSourceId(tSource.getSourceId());
|
||||
dutySource.setIfDelete("0");
|
||||
tDutySourceMapper.insert(dutySource);
|
||||
}
|
||||
}else {
|
||||
|
||||
Binary file not shown.
|
Before Width: | Height: | Size: 78 KiB After Width: | Height: | Size: 66 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 70 KiB After Width: | Height: | Size: 70 KiB |
@ -35,6 +35,10 @@ public class TDutySource implements Serializable {
|
||||
* 菜单id
|
||||
*/
|
||||
private Integer sourceId;
|
||||
/**
|
||||
* 菜单id
|
||||
*/
|
||||
private String ifDelete;
|
||||
|
||||
|
||||
}
|
||||
|
||||
@ -3,10 +3,11 @@
|
||||
<mapper namespace="com.fuint.repository.mapper.TDutySourceMapper">
|
||||
<select id="findSourceIdsByDutyId" resultType="java.lang.Long">
|
||||
select distinct t.source_id from t_duty_source t
|
||||
where t.duty_id = #{dutyId}
|
||||
where t.duty_id = #{dutyId} and if_delete = '0'
|
||||
</select>
|
||||
|
||||
<delete id="deleteSourcesByDutyId">
|
||||
delete from t_duty_source where duty_id = #{dutyId}
|
||||
</delete>
|
||||
<update id="deleteSourcesByDutyId">
|
||||
UPDATE t_duty_source
|
||||
SET if_delete = '1' where duty_id = #{dutyId}
|
||||
</update>
|
||||
</mapper>
|
||||
|
||||
@ -3,8 +3,9 @@ module.exports = {
|
||||
// baseUrl: 'https://vue.ruoyi.vip/prod-api',
|
||||
// baseUrl: 'http://192.168.0.196:8081/',
|
||||
// baseUrl: 'https://www.tuofeng.cc/oilAdmin/',
|
||||
baseUrl: 'https://oilapi.youkerr.com/oilAdmin/',
|
||||
// baseUrl: 'https://8q4f124343.yicp.fun/',
|
||||
baseUrl: 'http://192.168.31.96:8080/',
|
||||
// baseUrl: 'http://192.168.31.96:8080/',
|
||||
// baseUrl: 'http://192.168.1.5:8002/cdJdc',
|
||||
imagesUrl: 'http://www.nuoyunr.com/lananRsc',
|
||||
// 应用信息
|
||||
|
||||
Loading…
Reference in New Issue
Block a user