拍卖订单生成

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/distribution/AuctionRecordServiceImpl.java

@@ -160,7 +160,7 @@ public class AuctionRecordServiceImpl implements AuctionRecordService {
                 //插入最新出价记录
                 AuctionRecord addRecord = new AuctionRecord();
                 addRecord.setIsLead(true);
-                addRecord.setShareRecordId(shareRecordId);
+                addRecord.setShareRecordId(StringUtils.isEmpty(distributorShareRecord.getShareId())?CommConsts.DEFAULT_SHARE_ID:distributorShareRecord.getShareId());
                 addRecord.setCreateTime(now);
                 addRecord.setDistributorId(distributorShareRecord.getDistributorId());
                 addRecord.setItemId(itemId);

ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/distribution/DistributionOrderServiceImpl.java

@@ -241,7 +241,7 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
                 //查询用户第一次出价对应的分销商
                 AuctionRecord firstAuctionRecord = auctionRecordDao.findFirstRecord(dto.getItemId(), auctionRecord.getUserId());
                 String shareRecordId = firstAuctionRecord.getShareRecordId();
-                DistributorShareRecord distributorShareRecord = distributorShareRecordDao.findById(shareRecordId);
+               // DistributorShareRecord distributorShareRecord = distributorShareRecordDao.findById(shareRecordId);
                 //SupplierItem supplierItem = supplierItemDao.findById(dto.getItemId());
                 DistributionOrder distributionOrder = new DistributionOrder();
                 distributionOrder.setItemId(dto.getItemId());
@@ -250,7 +250,7 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
                 distributionOrder.setDistributionOrderId(distributionOrderId);
                 distributionOrder.setBuyerId(auctionRecord.getUserId());
                 distributionOrder.setBuyerOpenid(auctionRecord.getUserOpenId());
-                distributionOrder.setShopId(distributorShareRecord.getShopId());
+                distributionOrder.setShopId(firstAuctionRecord.getDistributorId());
                 distributionOrder.setSellerId(firstAuctionRecord.getDistributorId());
                 distributionOrder.setAmount(auctionRecord.getPrice());
                 distributionOrder.setCreateTime(auctionConfig.getRealEndTime());