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

加上售中下单逻辑，修改账号渠道，进粉统计的渠道和下单时保持一致

Browse Source
This commit is contained in:
xiezhijun
2021-06-01 19:24:40 +08:00
parent 783fd6fe3b
commit 77a8668b5d
23 changed files with 474 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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));
}