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

Merge branch 'master' of gitee.com:darlk/ShengTangManage into develop

Browse Source
This commit is contained in:
德仔
2021-06-03 10:50:24 +08:00
committed by Gitee
parent ea8276e6a0 b4c7fb50e3
commit f2d4dc6c79
33 changed files with 615 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysCommisionController.java
View File

@@ -8,6 +8,7 @@ import java.util.Map;
import java.util.TreeMap;
import com.stdiet.common.utils.DateUtils;
import com.stdiet.common.utils.StringUtils;
import com.stdiet.custom.domain.SysCommissionDayDetail;
import com.stdiet.custom.domain.SysOrder;
import com.stdiet.custom.domain.SysOrderCommisionDayDetail;
@@ -169,12 +170,45 @@ public class SysCommisionController extends BaseController {
public TableDataInfo getDetail(SysCommision sysCommision) {
startPage();
if(sysCommision.getPostId() != null && sysCommision.getPostId().intValue() > 0){
//查询售后所有ID
SysCommision param = new SysCommision();
param.setPostId(sysCommision.getPostId());
List<Long> userIds = sysCommisionService.getAfterSaleId(param);
sysCommision.setUserIds(userIds.size() == 0 ? null : userIds);
sysCommision.setPostId(null);
String postCodeId = "";
switch (sysCommision.getPostId().intValue()){
case 5:
postCodeId = "pre_sale_id";
break;
case 18:
postCodeId = "push_pre_sale_id";
break;
case 16:
postCodeId = "on_sale_id";
break;
case 6:
postCodeId = "after_sale_id";
break;
case 9:
postCodeId = "nutritionist_id";
break;
case 10:
postCodeId = "nutri_assis_id";
break;
case 11:
postCodeId = "operator_id";
break;
case 13:
postCodeId = "operator_assis_id";
break;
case 7:
postCodeId = "planner_id";
break;
case 8:
postCodeId = "planner_assis_id";
break;
default:
}
if(StringUtils.isEmpty(postCodeId)){
sysCommision.setPostId(null);
}else{
sysCommision.setPostCode(postCodeId);
}
}
List<SysCommision> list = sysCommisionService.selectSysCommisionDetail(sysCommision);
for (SysCommision detail : list) {

8
stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysImportFanRecordController.java
View File

@@ -154,12 +154,12 @@ public class SysImportFanRecordController extends BaseController
*/
@PreAuthorize("@ss.hasPermi('custom:importFanRecord:add')")
@GetMapping(value = "/getWxAccountAndSale")
public AjaxResult getWxAccountAndSale(SysImportFanWxAccount sysImportFanWxAccount){
public AjaxResult getWxAccountAndSale(SysWxSaleAccount sysWxSaleAccount){
Map<String, Object> result = new HashMap<>();
List<SysWxSaleAccount> list = sysWxSaleAccountService.getWxAccountAndSale();
List<Map<String,Object>> fanNumList = sysImportFanWxAccountService.getTotalImportFanNum(sysImportFanWxAccount);
List<SysWxSaleAccount> list = sysWxSaleAccountService.getWxAccountAndSale(sysWxSaleAccount);
//List<Map<String,Object>> fanNumList = sysImportFanWxAccountService.getTotalImportFanNum(sysImportFanWxAccount);
result.put("wxSaleAccountList", list);
result.put("fanNumList", fanNumList);
//result.put("fanNumList", fanNumList);
return AjaxResult.success(result);
}

3
stdiet-admin/src/main/java/com/stdiet/web/controller/custom/SysOrderController.java
View File

@@ -162,6 +162,9 @@ public class SysOrderController extends OrderBaseController {
if (user.getUserId().equals(order.getOperatorAssisId())) {
order.setOperatorAssis(user.getNickName());
}
if (user.getUserId().equals(order.getPushPreSaleId())) {
order.setPushPreSale(user.getNickName());
}
}
order.setOrderTypeName(OrderUtils.getOrderTypeName(order));
}