|
|
@@ -355,7 +355,7 @@ public class OrderLogic {
|
|
|
throw new RemoteServiceException("订单存在“以旧换新”活动商品，只能数量“1”单品下单");
|
|
|
}
|
|
|
//补充网点师傅相关信息
|
|
|
- this.supplyWorkUser(orderInfo, user);
|
|
|
+ // this.supplyWorkUser(orderInfo, user);
|
|
|
|
|
|
//实际需要支付的金额(包含运费)
|
|
|
BigDecimal payAmount = totalPrice.add(totalFreight);
|
|
|
@@ -403,6 +403,9 @@ public class OrderLogic {
|
|
|
orderInfo.setBuyerName(orderBuyBean.getBuyerName());
|
|
|
orderInfo.setBuyerIdCard(orderBuyBean.getBuyerIdCard());
|
|
|
orderInfo.setBuyerMobile(user.getMobile());
|
|
|
+ orderInfo.setWebsitId(user.getWebsitId());
|
|
|
+ orderInfo.setWebsitName(user.getWebsitName());
|
|
|
+ orderInfo.setWebsitNumber(user.getWebsitId());
|
|
|
//检查优惠券的使用合法性
|
|
|
|
|
|
if (!isPromotion && !hasGiftCode) {
|
‘linchangsheng’