Skip to content

GitLab

Q
qk_backend
Commit e498e4ad authored by shiyu's avatar shiyu
Browse files
Options

拍卖品官方估价

parent 8e4fc90c
Hide whitespace changes
Inline Side-by-side
Showing with 40 additions and 7 deletions
ch-admin-api/src/main/java/com/wwdz/ch/admin/impl/SysSupplierItemServiceImpl.java
View file @ e498e4ad
......@@ -272,7 +272,15 @@ public class SysSupplierItemServiceImpl implements SysSupplierItemService {
supplierItemVo.setAddExtent(PriceUtil.convertPriceFenToYuan(auctionConfig.getAddExtent()));
supplierItemVo.setAuctionState(auctionConfig.getState());
supplierItemVo.setAuctionStateName(AuctionEnum.StateEnum.getNameByCode(auctionConfig.getState()));
supplierItemVo.setEstimatedPrice(PriceUtil.convertPriceFenToYuan(auctionConfig.getEstimatedPrice()));
if (supplierItem.getSupplierId() != null) {
SupplierItem sourceItem = supplierItemDao.findById(supplierItem.getSupplierId());
if (sourceItem != null) {
supplierItemVo.setEstimatedPrice(PriceUtil.convertPriceFenToYuan(sourceItem.getOfficialEstimatedPrice()));
}
} else {
supplierItemVo.setEstimatedPrice(PriceUtil.convertPriceFenToYuan(supplierItem.getOfficialEstimatedPrice()));
}
// supplierItemVo.setEstimatedPrice(PriceUtil.convertPriceFenToYuan(auctionConfig.getEstimatedPrice()));
}
DistributionOrder distributionOrder = distributionOrderDao.findByItemId(supplierItem.getId());
if (distributionOrder != null) {
......@@ -328,7 +336,15 @@ public class SysSupplierItemServiceImpl implements SysSupplierItemService {
supplierItemVo.setStartPrice(PriceUtil.convertPriceFenToYuan(auctionConfig.getStartPrice()));
supplierItemVo.setAddExtent(PriceUtil.convertPriceFenToYuan(auctionConfig.getAddExtent()));
supplierItemVo.setAuctionState(auctionConfig.getState());
supplierItemVo.setEstimatedPrice(PriceUtil.convertPriceFenToYuan(auctionConfig.getEstimatedPrice()));
// supplierItemVo.setEstimatedPrice(PriceUtil.convertPriceFenToYuan(auctionConfig.getEstimatedPrice()));
if (supplierItem.getSupplierId() != null) {
SupplierItem sourceItem = supplierItemDao.findById(supplierItem.getSupplierId());
if (sourceItem != null) {
supplierItemVo.setEstimatedPrice(PriceUtil.convertPriceFenToYuan(sourceItem.getOfficialEstimatedPrice()));
}
} else {
supplierItemVo.setEstimatedPrice(PriceUtil.convertPriceFenToYuan(supplierItem.getOfficialEstimatedPrice()));
}
supplierItemVo.setAuctionStateName(AuctionEnum.StateEnum.getNameByCode(auctionConfig.getState()));
}
DistributionOrder distributionOrder = distributionOrderDao.findByItemId(supplierItem.getId());
......@@ -380,7 +396,15 @@ public class SysSupplierItemServiceImpl implements SysSupplierItemService {
supplierItemVo.setAuctionEndTime(auctionConfig.getEndTime());
supplierItemVo.setStartPrice(PriceUtil.convertPriceFenToYuan(auctionConfig.getStartPrice()));
supplierItemVo.setAddExtent(PriceUtil.convertPriceFenToYuan(auctionConfig.getAddExtent()));
supplierItemVo.setEstimatedPrice(PriceUtil.convertPriceFenToYuan(auctionConfig.getEstimatedPrice()));
// supplierItemVo.setEstimatedPrice(PriceUtil.convertPriceFenToYuan(auctionConfig.getEstimatedPrice()));
if (supplierItem.getSupplierId() != null) {
SupplierItem sourceItem = supplierItemDao.findById(supplierItem.getSupplierId());
if (sourceItem != null) {
supplierItemVo.setEstimatedPrice(PriceUtil.convertPriceFenToYuan(sourceItem.getOfficialEstimatedPrice()));
}
} else {
supplierItemVo.setEstimatedPrice(PriceUtil.convertPriceFenToYuan(supplierItem.getOfficialEstimatedPrice()));
}
} else if (supplierItem.getType() == DistributionEnum.DistributionTypeEnum.GROUP_PURCHASE.getCode()) {
//团购商品查询相关配置和优惠信息
GroupPurchaseConfig groupPurchaseConfig = groupPurchaseConfigDao.findByItemId(itemId);
......
ch-wx-api/src/main/java/com/wwdz/ch/wx/impl/distribution/SupplierItemServiceImpl.java
View file @ e498e4ad
......@@ -706,7 +706,16 @@ public class SupplierItemServiceImpl implements SupplierItemService {
String addExtent = PriceUtil.convertPriceFenToYuan(auctionConfig.getAddExtent());
auctionDetailVo.setAddExtent(addExtent);
auctionDetailVo.setAddExtentStr("¥" + addExtent + "/次");
auctionDetailVo.setEstimatedPrice(PriceUtil.convertPriceFenToYuan(auctionConfig.getEstimatedPrice()));
// auctionDetailVo.setEstimatedPrice(PriceUtil.convertPriceFenToYuan(auctionConfig.getEstimatedPrice()));
if (supplierItem.getSupplierId() != null) {
SupplierItem sourceItem = supplierItemDao.findById(supplierItem.getSupplierId());
if (sourceItem != null) {
auctionDetailVo.setEstimatedPrice(PriceUtil.convertPriceFenToYuan(sourceItem.getOfficialEstimatedPrice()));
}
} else {
auctionDetailVo.setEstimatedPrice(PriceUtil.convertPriceFenToYuan(supplierItem.getOfficialEstimatedPrice()));
}
Date startTime = auctionConfig.getStartTime();
Date realEndTime = auctionConfig.getRealEndTime();
auctionDetailVo.setStartTime(startTime);
......
ch-wx-api/src/test/java/com/wwdz/ch/wx/api/OfficialAccountApiTest.java
View file @ e498e4ad
......@@ -75,10 +75,10 @@ public class OfficialAccountApiTest {
@Test
public void sendSms() {
String url = wxAppletApi.getUrlLink(CommConsts.ITEM_OF_GROUPPURCHASE_URL,"itemId=" + 32894809);
// String url = wxAppletApi.getUrlLink(CommConsts.ITEM_OF_GROUPPURCHASE_URL,"itemId=" + 32894809);
//发短信
String msg = "手工扎基拉姆财神唐卡开启众筹，请前往"+ url + "查看";
aliSmsSender.sendSms("13645712452", msg);
String msg = "您的平台换藏订单因对方未寄到平台，目前订单已取消，为表示歉意，平台送您一枚天禧通宝钱币，祝您生活愉快！";
aliSmsSender.sendSms("13365063959", msg);
}
......
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