|
|
@ -47,26 +47,8 @@ import com.ms.api.util.DdRequestUtil;
|
|
|
|
import com.ms.dal.bo.OpLogisticsPlatformBO;
|
|
|
|
import com.ms.dal.bo.OpLogisticsPlatformBO;
|
|
|
|
import com.ms.dal.bo.OpOrderChildBO;
|
|
|
|
import com.ms.dal.bo.OpOrderChildBO;
|
|
|
|
import com.ms.dal.bo.PurchaseOrderBO;
|
|
|
|
import com.ms.dal.bo.PurchaseOrderBO;
|
|
|
|
import com.ms.dal.entity.OpOrder;
|
|
|
|
import com.ms.dal.entity.*;
|
|
|
|
import com.ms.dal.entity.OpOrderAmountDetail;
|
|
|
|
import com.ms.dal.mapper.*;
|
|
|
|
import com.ms.dal.entity.OpOrderChildLogistics;
|
|
|
|
|
|
|
|
import com.ms.dal.entity.OpOrderExt;
|
|
|
|
|
|
|
|
import com.ms.dal.entity.OpOrderGivenProduct;
|
|
|
|
|
|
|
|
import com.ms.dal.entity.OpOrderPriceProtection;
|
|
|
|
|
|
|
|
import com.ms.dal.entity.OpOrderRedpackInfo;
|
|
|
|
|
|
|
|
import com.ms.dal.entity.OpOrderSensitive;
|
|
|
|
|
|
|
|
import com.ms.dal.entity.PurchaseOrder;
|
|
|
|
|
|
|
|
import com.ms.dal.entity.PurchaseOrderItem;
|
|
|
|
|
|
|
|
import com.ms.dal.entity.PurchaseOrderSetting;
|
|
|
|
|
|
|
|
import com.ms.dal.entity.PurchaseSetting;
|
|
|
|
|
|
|
|
import com.ms.dal.entity.Shop;
|
|
|
|
|
|
|
|
import com.ms.dal.mapper.OpOrderChildMapper;
|
|
|
|
|
|
|
|
import com.ms.dal.mapper.OpOrderEncryptIndexMapper;
|
|
|
|
|
|
|
|
import com.ms.dal.mapper.OpOrderMapper;
|
|
|
|
|
|
|
|
import com.ms.dal.mapper.PurchaseOrderItemMapper;
|
|
|
|
|
|
|
|
import com.ms.dal.mapper.PurchaseOrderMapper;
|
|
|
|
|
|
|
|
import com.ms.dal.mapper.PurchaseOrderSettingMapper;
|
|
|
|
|
|
|
|
import com.ms.dal.mapper.PurchaseSettingMapper;
|
|
|
|
|
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
|
import org.apache.commons.lang3.StringUtils;
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
import org.springframework.stereotype.Service;
|
|
|
@ -638,7 +620,7 @@ public class PurchaseOrderServiceImpl implements PurchaseOrderService {
|
|
|
|
public DsPurchaseSettingBo getDsPurchaseSettingByShopId(Long shopId) {
|
|
|
|
public DsPurchaseSettingBo getDsPurchaseSettingByShopId(Long shopId) {
|
|
|
|
DsPurchaseSetting dsPurchaseSetting = dsPurchaseSettingMapper.selectByShopId(shopId);
|
|
|
|
DsPurchaseSetting dsPurchaseSetting = dsPurchaseSettingMapper.selectByShopId(shopId);
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
DsPurchaseSettingBo ret = new DsPurchaseSettingBo();
|
|
|
|
DsPurchaseSettingBo ret = new DsPurchaseSettingBo();
|
|
|
|