判断分销商是否购买过样品4

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

@@ -171,21 +171,7 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
     @Transactional
     public Result buySample(DistributionOrderRequestDto dto) {
         try {
-            String shareRecordId = dto.getShareRecordId();
-            DistributorShareRecord distributorShareRecord = null;
-            long itemId = 0;
-            if (com.xxdxxs.utils.StringUtils.isEmpty(shareRecordId) && dto.getItemId() == null) {
-                return Result.failed("商品信息为空");
-            } else if (com.xxdxxs.utils.StringUtils.hasLength(shareRecordId)) {
-                distributorShareRecord = distributorShareRecordDao.findById(shareRecordId);
-                if (distributorShareRecord == null || !distributorShareRecord.getEnabled()) {
-                    return Result.failed("该商品已下架");
-                } else {
-                    itemId = distributorShareRecord.getItemId();
-                }
-            } else {
-                itemId = dto.getItemId();
-            }
+            long itemId = dto.getItemId();
             //查询商品信息，检查商品库存
             SupplierItem supplierItem = supplierItemDao.findById(itemId);
             int stock = supplierItem.getStock();
@@ -195,7 +181,7 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
             String distributionOrderId = IdUtils.getOrderNumber(DISTRIBUTION_ORDER_PREFIX);
             DistributionOrderRequestDto prePayDto = new DistributionOrderRequestDto();
             prePayDto.setDistributionOrderId(distributionOrderId);
-            prePayDto.setAmount(String.valueOf(distributorShareRecord.getPrice() * dto.getItemNum()));
+            prePayDto.setAmount(String.valueOf(supplierItem.getDistributionPrice()));
             prePayDto.setBuyerOpenid(dto.getBuyerOpenid());
 
             prePayDto.setItemName(supplierItem.getName());
@@ -207,7 +193,7 @@ public class DistributionOrderServiceImpl implements DistributionOrderService {
             DistributionOrder distributionOrder = new DistributionOrder();
             distributionOrder.setItemId(itemId);
             distributionOrder.setItemNum(1);
-            distributionOrder.setShareRecordId(StringUtils.isEmpty(distributorShareRecord.getShareId())? ("DA" + SYSTEM_ACCOUNT) : distributorShareRecord.getShareId());
+            distributionOrder.setShareRecordId("DA" + SYSTEM_ACCOUNT);
             distributionOrder.setDistributionOrderId(distributionOrderId);
             distributionOrder.setPrepayId(prepayId);
             distributionOrder.setBuyerId(dto.getBuyerId());