|
|
|
@ -34,6 +34,7 @@ import java.util.ArrayList; |
|
|
|
|
import java.util.HashMap; |
|
|
|
|
import java.util.List; |
|
|
|
|
import java.util.Map; |
|
|
|
|
import java.util.stream.Collectors; |
|
|
|
|
|
|
|
|
|
@Controller |
|
|
|
|
@Api(value = "交易订单") |
|
|
|
@ -72,6 +73,8 @@ public class BsTradeOrderController { |
|
|
|
|
@RequestParam(value = "payMode" , required = false) String payMode, |
|
|
|
|
@RequestParam(value = "outTradeNo" , required = false) String outTradeNo, |
|
|
|
|
@RequestParam(value = "accTradeNo" , required = false) String accTradeNo, |
|
|
|
|
@RequestParam(value = "createTimeS" , required = false) Long createTimeS, |
|
|
|
|
@RequestParam(value = "createTimeE" , required = false) Long createTimeE, |
|
|
|
|
@RequestParam(value = "payTimeS" , required = false) Long payTimeS, |
|
|
|
|
@RequestParam(value = "payTimeE" , required = false) Long payTimeE, |
|
|
|
|
@RequestParam(value = "status" , required = false) Integer status, |
|
|
|
@ -135,6 +138,8 @@ public class BsTradeOrderController { |
|
|
|
|
param.put("accTradeNo", accTradeNo); |
|
|
|
|
param.put("payTimeS", payTimeS); |
|
|
|
|
param.put("payTimeE", payTimeE); |
|
|
|
|
param.put("createTimeS", createTimeS); |
|
|
|
|
param.put("createTimeE", createTimeE); |
|
|
|
|
param.put("status", status); |
|
|
|
|
param.put("specialField", specialField); |
|
|
|
|
|
|
|
|
@ -147,6 +152,101 @@ public class BsTradeOrderController { |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@RequestMapping(value="/countOrderData",method = RequestMethod.GET) |
|
|
|
|
@ResponseBody |
|
|
|
|
@ApiOperation(value = "查询订单列表") |
|
|
|
|
public ResponseData countOrderData(@RequestParam(value = "salesmanId" , required = false) Long salesmanId, |
|
|
|
|
@RequestParam(value = "merId" , required = false) Long merId, |
|
|
|
|
@RequestParam(value = "merNo" , required = false) String merNo, |
|
|
|
|
@RequestParam(value = "merName" , required = false) String merName, |
|
|
|
|
@RequestParam(value = "merAbbreviate" , required = false) String merAbbreviate, |
|
|
|
|
@RequestParam(value = "companyId" , required = false) Long companyId, |
|
|
|
|
@RequestParam(value = "agentId" , required = false) Long agentId, |
|
|
|
|
@RequestParam(value = "storeId" , required = false) Long storeId, |
|
|
|
|
@RequestParam(value = "storeName" , required = false) String storeName, |
|
|
|
|
@RequestParam(value = "payMode" , required = false) String payMode, |
|
|
|
|
@RequestParam(value = "outTradeNo" , required = false) String outTradeNo, |
|
|
|
|
@RequestParam(value = "accTradeNo" , required = false) String accTradeNo, |
|
|
|
|
@RequestParam(value = "createTimeS" , required = false) Long createTimeS, |
|
|
|
|
@RequestParam(value = "createTimeE" , required = false) Long createTimeE, |
|
|
|
|
@RequestParam(value = "payTimeS" , required = false) Long payTimeS, |
|
|
|
|
@RequestParam(value = "payTimeE" , required = false) Long payTimeE, |
|
|
|
|
@RequestParam(value = "status" , required = false) Integer status, |
|
|
|
|
@RequestParam(value = "specialField" , required = false) String specialField) { |
|
|
|
|
try { |
|
|
|
|
Map<String, Object> param = new HashMap<>(); |
|
|
|
|
UserInfoModel userModel = userCenter.getSessionModel(UserInfoModel.class); |
|
|
|
|
if (userModel.getSecUser().getObjectType().equals(SecUserTypeEnum.type0.getNumber())) { |
|
|
|
|
param.put("companyId", companyId); |
|
|
|
|
param.put("agentId", agentId); |
|
|
|
|
param.put("salesmanId", salesmanId); |
|
|
|
|
param.put("merId", merId); |
|
|
|
|
param.put("merName", merName); |
|
|
|
|
param.put("merAbbreviate", merAbbreviate); |
|
|
|
|
param.put("merNo", merNo); |
|
|
|
|
param.put("storeId", storeId); |
|
|
|
|
param.put("storeName", storeName); |
|
|
|
|
|
|
|
|
|
} else if (userModel.getSecUser().getObjectType().equals(SecUserTypeEnum.type1.getNumber())) { |
|
|
|
|
param.put("companyId", userModel.getBsCompany().getId()>2?userModel.getBsCompany().getId():null); |
|
|
|
|
param.put("agentId", agentId); |
|
|
|
|
param.put("salesmanId", salesmanId); |
|
|
|
|
param.put("merId", merId); |
|
|
|
|
param.put("merName", merName); |
|
|
|
|
param.put("merAbbreviate", merAbbreviate); |
|
|
|
|
param.put("merNo", merNo); |
|
|
|
|
param.put("storeId", storeId); |
|
|
|
|
param.put("storeName", storeName); |
|
|
|
|
|
|
|
|
|
} else if (userModel.getSecUser().getObjectType().equals(SecUserTypeEnum.type2.getNumber())) { |
|
|
|
|
param.put("agentId", userModel.getAgent().getId()); |
|
|
|
|
param.put("salesmanId", salesmanId); |
|
|
|
|
param.put("merId", merId); |
|
|
|
|
param.put("merNo", merNo); |
|
|
|
|
param.put("merName", merName); |
|
|
|
|
param.put("merAbbreviate", merAbbreviate); |
|
|
|
|
param.put("storeId", storeId); |
|
|
|
|
param.put("storeName", storeName); |
|
|
|
|
|
|
|
|
|
} else if (userModel.getSecUser().getObjectType().equals(SecUserTypeEnum.type3.getNumber())) { |
|
|
|
|
param.put("salesmanId", userModel.getSalesman().getId()); |
|
|
|
|
param.put("merId", merId); |
|
|
|
|
param.put("merNo", merNo); |
|
|
|
|
param.put("merName", merName); |
|
|
|
|
param.put("merAbbreviate", merAbbreviate); |
|
|
|
|
param.put("storeId", storeId); |
|
|
|
|
param.put("storeName", storeName); |
|
|
|
|
|
|
|
|
|
} else if (userModel.getSecUser().getObjectType().equals(SecUserTypeEnum.type4.getNumber())) { |
|
|
|
|
param.put("merId", userModel.getMer().getId()); |
|
|
|
|
param.put("storeId", storeId); |
|
|
|
|
param.put("storeName", storeName); |
|
|
|
|
|
|
|
|
|
} else if (userModel.getSecUser().getObjectType().equals(SecUserTypeEnum.type5.getNumber())) { |
|
|
|
|
param.put("storeId", userModel.getStore().getId()); |
|
|
|
|
} |
|
|
|
|
param.put("payMode", payMode); |
|
|
|
|
param.put("outTradeNo", outTradeNo); |
|
|
|
|
param.put("accTradeNo", accTradeNo); |
|
|
|
|
param.put("payTimeS", payTimeS); |
|
|
|
|
param.put("payTimeE", payTimeE); |
|
|
|
|
param.put("createTimeS", createTimeS); |
|
|
|
|
param.put("createTimeE", createTimeE); |
|
|
|
|
param.put("status", status); |
|
|
|
|
param.put("specialField", specialField); |
|
|
|
|
|
|
|
|
|
Map<String, Object> countData = tradeOrderService.countTradeOrderPrice(param); |
|
|
|
|
Map<String,Object> map = new HashMap<>(); |
|
|
|
|
map.put("totalCount", countData.get("count")); |
|
|
|
|
map.put("totalPrice", countData.get("tradePrice")); |
|
|
|
|
return ResponseMsgUtil.success(map); |
|
|
|
|
|
|
|
|
|
} catch (Exception e) { |
|
|
|
|
log.error(e.getMessage(), e); |
|
|
|
|
return ResponseMsgUtil.exception(e); |
|
|
|
|
} |
|
|
|
|
} |
|
|
|
|
|
|
|
|
|
@RequestMapping(value="/exportTradeOrder",method = RequestMethod.GET) |
|
|
|
|
@ResponseBody |
|
|
|
|
@ApiOperation(value = "导出交易订单") |
|
|
|
@ -162,6 +262,8 @@ public class BsTradeOrderController { |
|
|
|
|
@RequestParam(value = "payMode" , required = false) String payMode, |
|
|
|
|
@RequestParam(value = "outTradeNo" , required = false) String outTradeNo, |
|
|
|
|
@RequestParam(value = "accTradeNo" , required = false) String accTradeNo, |
|
|
|
|
@RequestParam(value = "createTimeS" , required = false) Long createTimeS, |
|
|
|
|
@RequestParam(value = "createTimeE" , required = false) Long createTimeE, |
|
|
|
|
@RequestParam(value = "payTimeS" , required = false) Long payTimeS, |
|
|
|
|
@RequestParam(value = "payTimeE" , required = false) Long payTimeE, |
|
|
|
|
@RequestParam(value = "status" , required = false) Integer status, |
|
|
|
@ -222,6 +324,8 @@ public class BsTradeOrderController { |
|
|
|
|
param.put("payMode", payMode); |
|
|
|
|
param.put("outTradeNo", outTradeNo); |
|
|
|
|
param.put("accTradeNo", accTradeNo); |
|
|
|
|
param.put("createTimeS", createTimeS); |
|
|
|
|
param.put("createTimeE", createTimeE); |
|
|
|
|
param.put("payTimeS", payTimeS); |
|
|
|
|
param.put("payTimeE", payTimeE); |
|
|
|
|
param.put("status", status); |
|
|
|
|