|
@@ -17,7 +17,7 @@ import com.goafanti.order.bo.C2COrderDetailBo;
|
|
|
import com.goafanti.order.bo.OrderChangeBo;
|
|
import com.goafanti.order.bo.OrderChangeBo;
|
|
|
|
|
|
|
|
public interface OrderService {
|
|
public interface OrderService {
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 查询商品详情
|
|
* 查询商品详情
|
|
|
* @param commodityId 商品id
|
|
* @param commodityId 商品id
|
|
@@ -55,7 +55,7 @@ public interface OrderService {
|
|
|
* @return
|
|
* @return
|
|
|
*/
|
|
*/
|
|
|
int updateRefundForTest(String orderNo, String refundAmount);
|
|
int updateRefundForTest(String orderNo, String refundAmount);
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 支付尾款
|
|
* 支付尾款
|
|
|
* @param orderNo 订单编号
|
|
* @param orderNo 订单编号
|
|
@@ -66,7 +66,7 @@ public interface OrderService {
|
|
|
int updatePayForLast(String orderNo, BigDecimal fundAmount, String remarks);
|
|
int updatePayForLast(String orderNo, BigDecimal fundAmount, String remarks);
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
- *
|
|
|
|
|
|
|
+ *
|
|
|
* @param confirm 是否
|
|
* @param confirm 是否
|
|
|
* @return
|
|
* @return
|
|
|
*/
|
|
*/
|
|
@@ -107,9 +107,9 @@ public interface OrderService {
|
|
|
* @return
|
|
* @return
|
|
|
*/
|
|
*/
|
|
|
int updateConfirmIntention(String orderNo, boolean confirm);
|
|
int updateConfirmIntention(String orderNo, boolean confirm);
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
- *
|
|
|
|
|
|
|
+ *
|
|
|
* @param bo
|
|
* @param bo
|
|
|
* @param startDate 开始时间
|
|
* @param startDate 开始时间
|
|
|
* @param endDate 结束时间
|
|
* @param endDate 结束时间
|
|
@@ -117,15 +117,15 @@ public interface OrderService {
|
|
|
* @param formal 是否包含正式
|
|
* @param formal 是否包含正式
|
|
|
* @param depId 部门id
|
|
* @param depId 部门id
|
|
|
* @param history 是否包含历史
|
|
* @param history 是否包含历史
|
|
|
- * @param pageNo
|
|
|
|
|
|
|
+ * @param pageNo
|
|
|
* @param pageSize
|
|
* @param pageSize
|
|
|
* @return
|
|
* @return
|
|
|
*/
|
|
*/
|
|
|
Pagination<OrderListBo> selectServiceOrder(OrderListBo bo,String startDate,String endDate,Integer intention,Integer formal,
|
|
Pagination<OrderListBo> selectServiceOrder(OrderListBo bo,String startDate,String endDate,Integer intention,Integer formal,
|
|
|
Integer pageNo, Integer pageSize);
|
|
Integer pageNo, Integer pageSize);
|
|
|
-
|
|
|
|
|
|
|
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 服务订单详情
|
|
* 服务订单详情
|
|
|
* @param orderNo
|
|
* @param orderNo
|
|
@@ -145,7 +145,7 @@ public interface OrderService {
|
|
|
*/
|
|
*/
|
|
|
int updateServiceOrder(String orderNo, String signFirstPayment,
|
|
int updateServiceOrder(String orderNo, String signFirstPayment,
|
|
|
String signTotalAmount, String contractNo,String orderRemarks,String contractPictureUrl);
|
|
String signTotalAmount, String contractNo,String orderRemarks,String contractPictureUrl);
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 签单
|
|
* 签单
|
|
|
* @param orderNo
|
|
* @param orderNo
|
|
@@ -180,7 +180,7 @@ public interface OrderService {
|
|
|
*/
|
|
*/
|
|
|
int addOrderCommodity(String orderNo, String commodityId, String commodityName,String commodityMode, Integer commodityQuantity,Integer commodityType,
|
|
int addOrderCommodity(String orderNo, String commodityId, String commodityName,String commodityMode, Integer commodityQuantity,Integer commodityType,
|
|
|
String commodityPrice, String discountPrice,String commodityFirstPayment,String discountFirstPayment, String remarks);
|
|
String commodityPrice, String discountPrice,String commodityFirstPayment,String discountFirstPayment, String remarks);
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 修改商品信息
|
|
* 修改商品信息
|
|
|
* @param detailId
|
|
* @param detailId
|
|
@@ -198,15 +198,15 @@ public interface OrderService {
|
|
|
* @return
|
|
* @return
|
|
|
*/
|
|
*/
|
|
|
int deleteOrderCommodity(String detailId);
|
|
int deleteOrderCommodity(String detailId);
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
- * 查询分管部门
|
|
|
|
|
|
|
+ * 查询分管部门、查询管理部门
|
|
|
* @return
|
|
* @return
|
|
|
*/
|
|
*/
|
|
|
List<OrganizationManagement> selectMyDeps();
|
|
List<OrganizationManagement> selectMyDeps();
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
- *
|
|
|
|
|
|
|
+ *
|
|
|
* @param bo
|
|
* @param bo
|
|
|
* @param startDate 开始时间
|
|
* @param startDate 开始时间
|
|
|
* @param endDate 结束时间
|
|
* @param endDate 结束时间
|
|
@@ -214,21 +214,21 @@ public interface OrderService {
|
|
|
* @param formal 是否包含正式
|
|
* @param formal 是否包含正式
|
|
|
* @param depIds 部门id
|
|
* @param depIds 部门id
|
|
|
* @param history 是否包含历史
|
|
* @param history 是否包含历史
|
|
|
- * @param pageNo
|
|
|
|
|
|
|
+ * @param pageNo
|
|
|
* @param pageSize
|
|
* @param pageSize
|
|
|
* @return
|
|
* @return
|
|
|
*/
|
|
*/
|
|
|
Pagination<OrderListBo> selectDepServiceOrder(OrderListBo bo,String startDate,String endDate,Integer intention,Integer formal,
|
|
Pagination<OrderListBo> selectDepServiceOrder(OrderListBo bo,String startDate,String endDate,Integer intention,Integer formal,
|
|
|
String depIds,Integer pageNo, Integer pageSize);
|
|
String depIds,Integer pageNo, Integer pageSize);
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
- *
|
|
|
|
|
|
|
+ *
|
|
|
* @param bo
|
|
* @param bo
|
|
|
* @param startDate 开始时间
|
|
* @param startDate 开始时间
|
|
|
* @param endDate 结束时间
|
|
* @param endDate 结束时间
|
|
|
* @param depIds 部门id
|
|
* @param depIds 部门id
|
|
|
* @param history 是否包含历史
|
|
* @param history 是否包含历史
|
|
|
- * @param pageNo
|
|
|
|
|
|
|
+ * @param pageNo
|
|
|
* @param pageSize
|
|
* @param pageSize
|
|
|
* @return
|
|
* @return
|
|
|
*/
|
|
*/
|
|
@@ -242,7 +242,7 @@ public interface OrderService {
|
|
|
* @return
|
|
* @return
|
|
|
*/
|
|
*/
|
|
|
Pagination<OrderListBo> selectPublicOrder(OrderListBo bo,String startDate,String endDate,Integer pageNo, Integer pageSize);
|
|
Pagination<OrderListBo> selectPublicOrder(OrderListBo bo,String startDate,String endDate,Integer pageNo, Integer pageSize);
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 指定的营销员
|
|
* 指定的营销员
|
|
|
* @param orderNo
|
|
* @param orderNo
|
|
@@ -250,9 +250,9 @@ public interface OrderService {
|
|
|
* @return
|
|
* @return
|
|
|
*/
|
|
*/
|
|
|
int updateAppointSalesman(String orderNo,String salesmanId);
|
|
int updateAppointSalesman(String orderNo,String salesmanId);
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
- *
|
|
|
|
|
|
|
+ *
|
|
|
* @param orderNo
|
|
* @param orderNo
|
|
|
* @param depId
|
|
* @param depId
|
|
|
* @param buyerName
|
|
* @param buyerName
|
|
@@ -263,10 +263,10 @@ public interface OrderService {
|
|
|
* @param pageSize
|
|
* @param pageSize
|
|
|
* @return
|
|
* @return
|
|
|
*/
|
|
*/
|
|
|
- Pagination<OrderListBo> selectSettlementList(String orderNo, String depId,String buyerName,String salesmanName,
|
|
|
|
|
|
|
+ Pagination<OrderListBo> selectSettlementList(String orderNo, String depId,String buyerName,String salesmanName,
|
|
|
String financeId,String financeName,Integer orderStatus,Integer liquidationStatus,Integer approval,Integer isDistributionFinance,
|
|
String financeId,String financeName,Integer orderStatus,Integer liquidationStatus,Integer approval,Integer isDistributionFinance,
|
|
|
String startDate,String endDate,Integer pageNo, Integer pageSize);
|
|
String startDate,String endDate,Integer pageNo, Integer pageSize);
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 我的订单流水(财务负责人课件)
|
|
* 我的订单流水(财务负责人课件)
|
|
|
* @param payeeName 收款人
|
|
* @param payeeName 收款人
|
|
@@ -280,7 +280,7 @@ public interface OrderService {
|
|
|
*/
|
|
*/
|
|
|
Pagination<BillListBo> selectMyBillList(String payeeName,String payerName,String depId,String salesmanName,String orderNo,
|
|
Pagination<BillListBo> selectMyBillList(String payeeName,String payerName,String depId,String salesmanName,String orderNo,
|
|
|
Integer confirmSign,Integer deleteSign,Integer pageNo,Integer pageSize);
|
|
Integer confirmSign,Integer deleteSign,Integer pageNo,Integer pageSize);
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
* 我的订单流水查询(与订单相关的人员可见)
|
|
* 我的订单流水查询(与订单相关的人员可见)
|
|
@@ -295,8 +295,8 @@ public interface OrderService {
|
|
|
*/
|
|
*/
|
|
|
Pagination<BillListBo> queryMyBillList(String payeeName,String payerName,String depId,String salesmanName,String orderNo,
|
|
Pagination<BillListBo> queryMyBillList(String payeeName,String payerName,String depId,String salesmanName,String orderNo,
|
|
|
Integer confirmSign,Integer deleteSign,Integer pageNo,Integer pageSize);
|
|
Integer confirmSign,Integer deleteSign,Integer pageNo,Integer pageSize);
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 所有订单流水查询
|
|
* 所有订单流水查询
|
|
|
* @param payeeName
|
|
* @param payeeName
|
|
@@ -310,7 +310,7 @@ public interface OrderService {
|
|
|
*/
|
|
*/
|
|
|
Pagination<BillListBo> queryAllBillList(String payeeName,String payerName,String depId,String salesmanName,String financeName,String orderNo,
|
|
Pagination<BillListBo> queryAllBillList(String payeeName,String payerName,String depId,String salesmanName,String financeName,String orderNo,
|
|
|
Integer confirmSign,Integer deleteSign,Integer pageNo,Integer pageSize);
|
|
Integer confirmSign,Integer deleteSign,Integer pageNo,Integer pageSize);
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 查看流水详情
|
|
* 查看流水详情
|
|
|
* @param billNo
|
|
* @param billNo
|
|
@@ -326,8 +326,8 @@ public interface OrderService {
|
|
|
* @return
|
|
* @return
|
|
|
*/
|
|
*/
|
|
|
int updateBill(String billNo, String orderNo, Integer confrim,String financialPayNo,String financialPayTime,String remarks);
|
|
int updateBill(String billNo, String orderNo, Integer confrim,String financialPayNo,String financialPayTime,String remarks);
|
|
|
-
|
|
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 修改露水订单
|
|
* 修改露水订单
|
|
|
* @param billNo
|
|
* @param billNo
|
|
@@ -365,14 +365,14 @@ public interface OrderService {
|
|
|
* @return
|
|
* @return
|
|
|
*/
|
|
*/
|
|
|
int updateSetUpProject(String orderNo, String signComment);
|
|
int updateSetUpProject(String orderNo, String signComment);
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 订单编号
|
|
* 订单编号
|
|
|
* @param orderNo
|
|
* @param orderNo
|
|
|
* @return
|
|
* @return
|
|
|
*/
|
|
*/
|
|
|
List<TOrderDetail> selectOrderCommodity(String orderNo);
|
|
List<TOrderDetail> selectOrderCommodity(String orderNo);
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 支付(测试用)
|
|
* 支付(测试用)
|
|
|
* @param orderNo
|
|
* @param orderNo
|
|
@@ -417,7 +417,7 @@ public interface OrderService {
|
|
|
* @return
|
|
* @return
|
|
|
*/
|
|
*/
|
|
|
int updateConfirmRefund(String orderNo,boolean confirm);
|
|
int updateConfirmRefund(String orderNo,boolean confirm);
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* 转交订单
|
|
* 转交订单
|
|
|
* @param orderNo
|
|
* @param orderNo
|
|
@@ -426,7 +426,7 @@ public interface OrderService {
|
|
|
* @return
|
|
* @return
|
|
|
*/
|
|
*/
|
|
|
int updateTransferOrder(String orderNo,String aid,Integer targetType);
|
|
int updateTransferOrder(String orderNo,String aid,Integer targetType);
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
/**
|
|
/**
|
|
|
* PC端添加意向
|
|
* PC端添加意向
|
|
|
* @param orderNo 订单编号
|
|
* @param orderNo 订单编号
|
|
@@ -438,15 +438,15 @@ public interface OrderService {
|
|
|
* @param remarks 备注
|
|
* @param remarks 备注
|
|
|
* @return
|
|
* @return
|
|
|
*/
|
|
*/
|
|
|
- int addPurpose(String orderNo, String commodityId, String commodityMode, Integer commodityQuantity,Integer commodityType,
|
|
|
|
|
|
|
+ int addPurpose(String orderNo, String commodityId, String commodityMode, Integer commodityQuantity,Integer commodityType,
|
|
|
String createTime,String remarks) throws ParseException;
|
|
String createTime,String remarks) throws ParseException;
|
|
|
|
|
|
|
|
/**
|
|
/**
|
|
|
* 添加变更记录
|
|
* 添加变更记录
|
|
|
* @param orderNo
|
|
* @param orderNo
|
|
|
* @param changeComment
|
|
* @param changeComment
|
|
|
- * @param dunList
|
|
|
|
|
- * @param taskList
|
|
|
|
|
|
|
+ * @param dunList
|
|
|
|
|
+ * @param taskList
|
|
|
* @return
|
|
* @return
|
|
|
*/
|
|
*/
|
|
|
int addOrderChange(String orderNo, String changeComment, String taskList, String dunList);
|
|
int addOrderChange(String orderNo, String changeComment, String taskList, String dunList);
|
|
@@ -486,7 +486,7 @@ public interface OrderService {
|
|
|
|
|
|
|
|
int addBusinessProjectId(FollowBusinessBo fbb);
|
|
int addBusinessProjectId(FollowBusinessBo fbb);
|
|
|
|
|
|
|
|
-
|
|
|
|
|
|
|
|
|
|
-
|
|
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
}
|
|
}
|