Authored by tanling

去掉是否分仓的参数

... ... @@ -203,7 +203,7 @@ public interface ISendOrderMessage {
* @param expressNum 快递单号
* @return
*/
public SendMessageRspBo orderSendOutNew(String uid, String uName, String orderCode, String companyName, String expressNum, String arriveDate,int miniappFlg, String productName, int deliveryTime, int deliveryType);
public SendMessageRspBo orderSendOutNew(String uid, String uName, String orderCode, String companyName, String expressNum, String arriveDate,int miniappFlg, String productName, int deliveryTime);
/**
* 新定义订单发货通知,收件人为yoho用户(支持微信)
... ... @@ -214,7 +214,7 @@ public interface ISendOrderMessage {
* @param expressNum
* @return
*/
public SendMessageRspBo orderSendOutOther(String uid, String uName, String orderCode, String companyName, String expressNum, String arriveDate,int miniappFlg, String productName, int deliveryTime, int deliveryType);
public SendMessageRspBo orderSendOutOther(String uid, String uName, String orderCode, String companyName, String expressNum, String arriveDate,int miniappFlg, String productName, int deliveryTime);
/**
* 订单发货通知发至分仓(支持微信)
... ... @@ -225,7 +225,7 @@ public interface ISendOrderMessage {
* @param expressNum 快递单号
* @return
*/
public SendMessageRspBo orderSendOutWarehouse(String uid, String uName, String orderCode, String companyName, String expressNum, String arriveDate,int miniappFlg, String productName, int deliveryTime, int deliveryType);
public SendMessageRspBo orderSendOutWarehouse(String uid, String uName, String orderCode, String companyName, String expressNum, String arriveDate,int miniappFlg, String productName, int deliveryTime);
/**
* 订单发货通知发至分仓(支持微信),收件人为yoho用户
... ... @@ -236,7 +236,7 @@ public interface ISendOrderMessage {
* @param expressNum
* @return
*/
public SendMessageRspBo orderSendOutOtherWarehouse(String uid, String uName, String orderCode, String companyName, String expressNum, String arriveDate,int miniappFlg, String productName, int deliveryTime, int deliveryType);
public SendMessageRspBo orderSendOutOtherWarehouse(String uid, String uName, String orderCode, String companyName, String expressNum, String arriveDate,int miniappFlg, String productName, int deliveryTime);
/**
* 订单取消(支持微信)
... ...
... ... @@ -222,26 +222,24 @@ public class SendOrderMessageImpl extends AbstractSendMessage implements ISendOr
* @param miniappFlg 0 不是小程序 1是小程序
* @param productName 商品名称
* @param deliveryTime 发货时间
* @param deliveryType 0 普通发货 1 JIT分仓
*
* @return
*/
@Override
public SendMessageRspBo orderSendOutNew(String uid, String uName, String orderCode, String companyName, String expressNum, String arriveDate,
int miniappFlg, String productName, int deliveryTime, int deliveryType) {
return this.dealOrderSendOut(SendScenes.ORDER_SEND_OUT_NEW, uid, uName, orderCode, companyName, expressNum, arriveDate, miniappFlg, productName, deliveryTime,deliveryType);
int miniappFlg, String productName, int deliveryTime) {
return this.dealOrderSendOut(SendScenes.ORDER_SEND_OUT_NEW, uid, uName, orderCode, companyName, expressNum, arriveDate, miniappFlg, productName, deliveryTime,0);
}
@Override
public SendMessageRspBo orderSendOutOther(String uid, String uName, String orderCode, String companyName, String expressNum, String arriveDate,
int miniappFlg, String productName, int deliveryTime, int deliveryType) {
return this.dealOrderSendOut(SendScenes.ORDER_SEND_OUT_OTHER, uid, uName, orderCode, companyName, expressNum, arriveDate,miniappFlg, productName, deliveryTime, deliveryType);
int miniappFlg, String productName, int deliveryTime) {
return this.dealOrderSendOut(SendScenes.ORDER_SEND_OUT_OTHER, uid, uName, orderCode, companyName, expressNum, arriveDate,miniappFlg, productName, deliveryTime, 0);
}
@Override
public SendMessageRspBo orderSendOutWarehouse(String uid, String uName, String orderCode, String companyName, String expressNum, String arriveDate,
int miniappFlg, String productName, int deliveryTime, int deliveryType) {
return this.dealOrderSendOut(SendScenes.ORDER_SEND_OUT_WAREHOUSE, uid, uName, orderCode, companyName, expressNum, arriveDate, miniappFlg, productName, deliveryTime,deliveryType);
int miniappFlg, String productName, int deliveryTime) {
return this.dealOrderSendOut(SendScenes.ORDER_SEND_OUT_WAREHOUSE, uid, uName, orderCode, companyName, expressNum, arriveDate, miniappFlg, productName, deliveryTime,1);
}
/**
... ... @@ -255,13 +253,12 @@ public class SendOrderMessageImpl extends AbstractSendMessage implements ISendOr
* @param miniappFlg 0 不是小程序 1是小程序
* @param productName 商品名称
* @param deliveryTime 发货时间
* @param deliveryType 0 普通发货 1 JIT分仓
* @return
*/
@Override
public SendMessageRspBo orderSendOutOtherWarehouse(String uid, String uName, String orderCode, String companyName, String expressNum, String arriveDate,
int miniappFlg, String productName, int deliveryTime, int deliveryType) {
return this.dealOrderSendOut(SendScenes.ORDER_SEND_OUT_OTHER_WAREHOUSE, uid, uName, orderCode, companyName, expressNum, arriveDate, miniappFlg, productName, deliveryTime, deliveryType);
int miniappFlg, String productName, int deliveryTime) {
return this.dealOrderSendOut(SendScenes.ORDER_SEND_OUT_OTHER_WAREHOUSE, uid, uName, orderCode, companyName, expressNum, arriveDate, miniappFlg, productName, deliveryTime, 1);
}
/**
... ...