YOHOBUY / yoho-message-sdk · Commits

Go to a project

Authored by tanling
Commit c8ebca0870fcc1f9e68293ff607536e17e5e54f4 1 parent cf1e392f

去掉是否分仓的参数

Inline Side-by-side
Showing 2 changed files with 12 additions and 15 deletions
@@ -203,7 +203,7 @@ public interface ISendOrderMessage { @@ -203,7 +203,7 @@ public interface ISendOrderMessage {
203 * @param expressNum 快递单号 203 * @param expressNum 快递单号
204 * @return 204 * @return
205 */ 205 */
206 - public SendMessageRspBo orderSendOutNew(String uid, String uName, String orderCode, String companyName, String expressNum, String arriveDate,int miniappFlg, String productName, int deliveryTime, int deliveryType); 206 + public SendMessageRspBo orderSendOutNew(String uid, String uName, String orderCode, String companyName, String expressNum, String arriveDate,int miniappFlg, String productName, int deliveryTime);
207 207
208 /** 208 /**
209 * 新定义订单发货通知,收件人为yoho用户（支持微信） 209 * 新定义订单发货通知,收件人为yoho用户（支持微信）
@@ -214,7 +214,7 @@ public interface ISendOrderMessage { @@ -214,7 +214,7 @@ public interface ISendOrderMessage {
214 * @param expressNum 214 * @param expressNum
215 * @return 215 * @return
216 */ 216 */
217 - public SendMessageRspBo orderSendOutOther(String uid, String uName, String orderCode, String companyName, String expressNum, String arriveDate,int miniappFlg, String productName, int deliveryTime, int deliveryType); 217 + public SendMessageRspBo orderSendOutOther(String uid, String uName, String orderCode, String companyName, String expressNum, String arriveDate,int miniappFlg, String productName, int deliveryTime);
218 218
219 /** 219 /**
220 * 订单发货通知发至分仓（支持微信） 220 * 订单发货通知发至分仓（支持微信）
@@ -225,7 +225,7 @@ public interface ISendOrderMessage { @@ -225,7 +225,7 @@ public interface ISendOrderMessage {
225 * @param expressNum 快递单号 225 * @param expressNum 快递单号
226 * @return 226 * @return
227 */ 227 */
228 - public SendMessageRspBo orderSendOutWarehouse(String uid, String uName, String orderCode, String companyName, String expressNum, String arriveDate,int miniappFlg, String productName, int deliveryTime, int deliveryType); 228 + public SendMessageRspBo orderSendOutWarehouse(String uid, String uName, String orderCode, String companyName, String expressNum, String arriveDate,int miniappFlg, String productName, int deliveryTime);
229 229
230 /** 230 /**
231 * 订单发货通知发至分仓（支持微信）,收件人为yoho用户 231 * 订单发货通知发至分仓（支持微信）,收件人为yoho用户
@@ -236,7 +236,7 @@ public interface ISendOrderMessage { @@ -236,7 +236,7 @@ public interface ISendOrderMessage {
236 * @param expressNum 236 * @param expressNum
237 * @return 237 * @return
238 */ 238 */
239 - public SendMessageRspBo orderSendOutOtherWarehouse(String uid, String uName, String orderCode, String companyName, String expressNum, String arriveDate,int miniappFlg, String productName, int deliveryTime, int deliveryType); 239 + public SendMessageRspBo orderSendOutOtherWarehouse(String uid, String uName, String orderCode, String companyName, String expressNum, String arriveDate,int miniappFlg, String productName, int deliveryTime);
240 240
241 /** 241 /**
242 * 订单取消（支持微信） 242 * 订单取消（支持微信）
@@ -222,26 +222,24 @@ public class SendOrderMessageImpl extends AbstractSendMessage implements ISendOr @@ -222,26 +222,24 @@ public class SendOrderMessageImpl extends AbstractSendMessage implements ISendOr
222 * @param miniappFlg 0 不是小程序 1是小程序 222 * @param miniappFlg 0 不是小程序 1是小程序
223 * @param productName 商品名称 223 * @param productName 商品名称
224 * @param deliveryTime 发货时间 224 * @param deliveryTime 发货时间
225 - * @param deliveryType 0 普通发货 1 JIT分仓  
226 - *  
227 * @return 225 * @return
228 */ 226 */
229 @Override 227 @Override
230 public SendMessageRspBo orderSendOutNew(String uid, String uName, String orderCode, String companyName, String expressNum, String arriveDate, 228 public SendMessageRspBo orderSendOutNew(String uid, String uName, String orderCode, String companyName, String expressNum, String arriveDate,
231 - int miniappFlg, String productName, int deliveryTime, int deliveryType) {  
232 - return this.dealOrderSendOut(SendScenes.ORDER_SEND_OUT_NEW, uid, uName, orderCode, companyName, expressNum, arriveDate, miniappFlg, productName, deliveryTime,deliveryType); 229 + int miniappFlg, String productName, int deliveryTime) {
  230 + return this.dealOrderSendOut(SendScenes.ORDER_SEND_OUT_NEW, uid, uName, orderCode, companyName, expressNum, arriveDate, miniappFlg, productName, deliveryTime,0);
233 } 231 }
234 232
235 @Override 233 @Override
236 public SendMessageRspBo orderSendOutOther(String uid, String uName, String orderCode, String companyName, String expressNum, String arriveDate, 234 public SendMessageRspBo orderSendOutOther(String uid, String uName, String orderCode, String companyName, String expressNum, String arriveDate,
237 - int miniappFlg, String productName, int deliveryTime, int deliveryType) {  
238 - return this.dealOrderSendOut(SendScenes.ORDER_SEND_OUT_OTHER, uid, uName, orderCode, companyName, expressNum, arriveDate,miniappFlg, productName, deliveryTime, deliveryType); 235 + int miniappFlg, String productName, int deliveryTime) {
  236 + return this.dealOrderSendOut(SendScenes.ORDER_SEND_OUT_OTHER, uid, uName, orderCode, companyName, expressNum, arriveDate,miniappFlg, productName, deliveryTime, 0);
239 } 237 }
240 238
241 @Override 239 @Override
242 public SendMessageRspBo orderSendOutWarehouse(String uid, String uName, String orderCode, String companyName, String expressNum, String arriveDate, 240 public SendMessageRspBo orderSendOutWarehouse(String uid, String uName, String orderCode, String companyName, String expressNum, String arriveDate,
243 - int miniappFlg, String productName, int deliveryTime, int deliveryType) {  
244 - return this.dealOrderSendOut(SendScenes.ORDER_SEND_OUT_WAREHOUSE, uid, uName, orderCode, companyName, expressNum, arriveDate, miniappFlg, productName, deliveryTime,deliveryType); 241 + int miniappFlg, String productName, int deliveryTime) {
  242 + return this.dealOrderSendOut(SendScenes.ORDER_SEND_OUT_WAREHOUSE, uid, uName, orderCode, companyName, expressNum, arriveDate, miniappFlg, productName, deliveryTime,1);
245 } 243 }
246 244
247 /** 245 /**
@@ -255,13 +253,12 @@ public class SendOrderMessageImpl extends AbstractSendMessage implements ISendOr @@ -255,13 +253,12 @@ public class SendOrderMessageImpl extends AbstractSendMessage implements ISendOr
255 * @param miniappFlg 0 不是小程序 1是小程序 253 * @param miniappFlg 0 不是小程序 1是小程序
256 * @param productName 商品名称 254 * @param productName 商品名称
257 * @param deliveryTime 发货时间 255 * @param deliveryTime 发货时间
258 - * @param deliveryType 0 普通发货 1 JIT分仓  
259 * @return 256 * @return
260 */ 257 */
261 @Override 258 @Override
262 public SendMessageRspBo orderSendOutOtherWarehouse(String uid, String uName, String orderCode, String companyName, String expressNum, String arriveDate, 259 public SendMessageRspBo orderSendOutOtherWarehouse(String uid, String uName, String orderCode, String companyName, String expressNum, String arriveDate,
263 - int miniappFlg, String productName, int deliveryTime, int deliveryType) {  
264 - return this.dealOrderSendOut(SendScenes.ORDER_SEND_OUT_OTHER_WAREHOUSE, uid, uName, orderCode, companyName, expressNum, arriveDate, miniappFlg, productName, deliveryTime, deliveryType); 260 + int miniappFlg, String productName, int deliveryTime) {
  261 + return this.dealOrderSendOut(SendScenes.ORDER_SEND_OUT_OTHER_WAREHOUSE, uid, uName, orderCode, companyName, expressNum, arriveDate, miniappFlg, productName, deliveryTime, 1);
265 } 262 }
266 263
267 /** 264 /**