Commit 453b7f54 authored by shiyu's avatar shiyu

预支付接口3

parent 3d9b6ef8
...@@ -40,7 +40,7 @@ public class DistributorShareRecordServiceImpl implements DistributorShareRecord ...@@ -40,7 +40,7 @@ public class DistributorShareRecordServiceImpl implements DistributorShareRecord
return Result.failed("售价不能低于分销价"); return Result.failed("售价不能低于分销价");
} }
DistributorShareRecord distributorShareRecord = new DistributorShareRecord(); DistributorShareRecord distributorShareRecord = new DistributorShareRecord();
String shareRecordId = UUID.fastUUID().toString(); String shareRecordId = UUID.fastUUID().toString(true);
distributorShareRecord.setShareId(shareRecordId); distributorShareRecord.setShareId(shareRecordId);
distributorShareRecord.setItemId(dto.getItemId()); distributorShareRecord.setItemId(dto.getItemId());
distributorShareRecord.setPrice(PriceUtil.convertPriceFromStr(dto.getPrice())); distributorShareRecord.setPrice(PriceUtil.convertPriceFromStr(dto.getPrice()));
......
...@@ -4,7 +4,9 @@ import com.github.pagehelper.PageInfo; ...@@ -4,7 +4,9 @@ import com.github.pagehelper.PageInfo;
import com.wwdz.ch.core.type.PageSearchResult; import com.wwdz.ch.core.type.PageSearchResult;
import com.wwdz.ch.core.type.Result; import com.wwdz.ch.core.type.Result;
import com.wwdz.ch.core.util.MediaUtil; import com.wwdz.ch.core.util.MediaUtil;
import com.wwdz.ch.db.dao.distribution.DistributorShareRecordDao;
import com.wwdz.ch.db.dao.distribution.SupplierItemDao; import com.wwdz.ch.db.dao.distribution.SupplierItemDao;
import com.wwdz.ch.db.domain.distribution.DistributorShareRecord;
import com.wwdz.ch.db.domain.distribution.SupplierItem; import com.wwdz.ch.db.domain.distribution.SupplierItem;
import com.wwdz.ch.db.dto.request.distribution.SupplierItemRequestDto; import com.wwdz.ch.db.dto.request.distribution.SupplierItemRequestDto;
import com.wwdz.ch.wx.entity.vo.distribution.SupplierItemVo; import com.wwdz.ch.wx.entity.vo.distribution.SupplierItemVo;
...@@ -16,7 +18,9 @@ import org.springframework.beans.factory.annotation.Autowired; ...@@ -16,7 +18,9 @@ import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Map;
@Service @Service
public class SupplierItemServiceImpl implements SupplierItemService { public class SupplierItemServiceImpl implements SupplierItemService {
...@@ -26,6 +30,9 @@ public class SupplierItemServiceImpl implements SupplierItemService { ...@@ -26,6 +30,9 @@ public class SupplierItemServiceImpl implements SupplierItemService {
@Autowired @Autowired
SupplierItemDao supplierItemDao; SupplierItemDao supplierItemDao;
@Autowired
DistributorShareRecordDao distributorShareRecordDao;
@Override @Override
public Result findList(SupplierItemRequestDto dto) { public Result findList(SupplierItemRequestDto dto) {
......
...@@ -38,7 +38,7 @@ public class DistributionOrderController { ...@@ -38,7 +38,7 @@ public class DistributionOrderController {
Validator validator = new Validator(FormHandler.ofEntity(dto)); Validator validator = new Validator(FormHandler.ofEntity(dto));
validator.set("shareRecordId", "分销分享记录id").must().string() validator.set("shareRecordId", "分销分享记录id").must().string()
.set("buyerId", "买方id").must().number() .set("buyerId", "买方id").must().number()
.set("buyerOpenId", "买方微信openid").must().number() .set("buyerOpenId", "买方微信openid").must().string()
.end(); .end();
if (!validator.isValid()) { if (!validator.isValid()) {
return Result.failed(validator.getErrorInfo()); return Result.failed(validator.getErrorInfo());
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment