Song/xkrs_ms
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

提成优化，加上替换订单

Browse Source
This commit is contained in:
xiezhijun 2021-05-28 18:32:20 +08:00
parent 0122c35553
commit d48cecc923
3 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
stdiet-custom/src/main/java/com/stdiet/custom/service/impl/SysCommissionDayServiceImpl.java
View File

@ -53,7 +53,7 @@ public class SysCommissionDayServiceImpl implements ISysCommissionDayService {
total.setTotalNotSentCommissionAmount(new BigDecimal(0));
total.setNextMonthCommission(new BigDecimal(0));
if(list != null && list.size() > 0){
sysCommision.setUserId(null); //由于存在售后、营养师更换问题，不能根据营养师或售后查询订单
//sysCommision.setUserId(null); //由于存在售后、营养师更换问题，不能根据营养师或售后查询订单
Map<Long, List<SysOrderCommisionDayDetail>> orderDetailMap = getOrderByList(sysCommision, true);
SysCommissionDayDetail sysCommissionDayDetail = null;
for(SysCommision commision : list){
@ -489,9 +489,6 @@ public class SysCommissionDayServiceImpl implements ISysCommissionDayService {
if(detail.getNutritionistId() != null && detail.getNutritionistId() > 0L){
addUserOrderResultMap(detail.getNutritionistId(), detail, userOrderResultMap);
}
if(detail.getAfterSaleId() != null && detail.getAfterSaleId().longValue() == 257L){
System.out.println(detail.getOrderId() + "-" + detail.getOrderAmount());
}
}
}
}
@ -514,12 +511,12 @@ public class SysCommissionDayServiceImpl implements ISysCommissionDayService {
//售后和营养师分类
for (SysOrderNutritionistReplaceRecord sysOrderRecord : replaceRecordList) {
if (sysOrderRecord.getNutritionistId() != null && sysOrderRecord.getNutritionistId().longValue() > 0 &&
sysOrder.getNutritionistId() != null && sysOrder.getNutritionistId().longValue() != sysOrderRecord.getNutritionistId()) {
if (sysOrderRecord.getNutritionistId() != null && sysOrderRecord.getNutritionistId().longValue() > 0
&& sysOrder.getNutritionistId() != null && sysOrder.getNutritionistId().longValue() != sysOrderRecord.getNutritionistId().longValue()) {
nutritionistRecord.add(sysOrderRecord);
}
if (sysOrderRecord.getAfterSaleId() != null && sysOrderRecord.getAfterSaleId().longValue() > 0
&& sysOrder.getAfterSaleId().longValue() != sysOrderRecord.getAfterSaleId()) {
&& sysOrder.getAfterSaleId() != null && sysOrder.getAfterSaleId().longValue() != sysOrderRecord.getAfterSaleId().longValue()) {
afterSaleRecord.add(sysOrderRecord);
}
}
@ -613,12 +610,12 @@ public class SysCommissionDayServiceImpl implements ISysCommissionDayService {
}
}
}
/**for (SysOrderCommisionDayDetail c : sysOrderCommisionDayDetailList) {
/*for (SysOrderCommisionDayDetail c : sysOrderCommisionDayDetailList) {
System.out.println(c.getOrderId() + "-" + c.getNutritionistId() + "-" + c.getAfterSaleId() + "-"+
DateUtils.localDateToString(c.getServerStartDate(),"yyyy-MM-dd") + "-" +
DateUtils.localDateToString(c.getServerEndDate(),"yyyy-MM-dd") +
"-" + c.getDayMoney().doubleValue() + "-" + c.getOrderAmount().doubleValue());
}**/
}*/
return sysOrderCommisionDayDetailList;
}

2
stdiet-custom/src/main/resources/mapper/custom/SysOrderMapper.xml
View File

@ -468,7 +468,7 @@
<if test="reviewStatus != null and reviewStatus != ''">
and review_status = #{reviewStatus}
</if>
<if test="userId != null"><!-- 限于营养师、售后不可能同一个的情况下 -->
<if test="userId != null">
and (
su_sale.user_id = #{userId} or su_nutritionist.user_id = #{userId}
<!-- 是否查询根据用户ID查询对应替换订单 -->

7
stdiet-ui/src/components/OrdercommissDetail/index.vue
View File

@ -243,6 +243,7 @@ export default {
totalSendCommission: 0,
totalNotSendCommission: 0,
serverDateScope: null,
fileName:""
};
},
computed: {},
@ -261,14 +262,18 @@ export default {
this.queryParam.reviewStatus = this.data.reviewStatus;
this.queryParam.endTime = this.data.endTime;
this.title = `「${this.data.name}`;
this.fileName = this.data.name;
if (this.data.yearMonth) {
this.title += " 截止" + `${this.data.yearMonth}`;
this.fileName += "截止" + `${this.data.yearMonth}`;
}
if (this.queryParam.reviewStatus) {
this.title +=
this.queryParam.reviewStatus == "yes" ? " 已审核" : " 未审核";
this.fileName += this.queryParam.reviewStatus == "yes" ? "已审核" : "未审核";
}
this.title += " 订单提成列表」";
this.fileName += "订单提成列表";
this.visible = true;
this.fetchOrderList();
},
@ -343,7 +348,7 @@ export default {
return exportOrderDetailDay(queryParams);
})
.then((response) => {
this.download(response.msg);
this.download(response.msg, this.fileName+".xls");
})
.catch(function () {});
}