求购-调价

@@ -155,9 +155,31 @@ public class BuyerBidController {
      * @param price
      * @return
      */
+    @RequestMapping(params = "method=ufo.buyer.bid.preChangePrice")
+    @ResponseBody
+    public ApiResponse preChangePrice(@RequestParam(name = "uid") int uid,
+                                      @RequestParam(name = "orderCode") long orderCode,
+                                      @RequestParam(name = "price") String price) {
+        logger.info("in ufo.buyer.bid.preChangePrice, uid:{},orderCode:{},price:{}", uid, orderCode, price);
+        BuyerBidChangePriceRequest req = BuyerBidChangePriceRequest.builder().uid(uid).orderCode(orderCode)
+                .price(priceComputePrepareProcessor.checkAndAcquireSalePrice(price, SkupType.IN_STOCK))
+                .build();
+
+        BidPrePublishResponse response = buyerBidPriceService.preChangePrice(req);
+        return new ApiResponse.ApiResponseBuilder().code(200).data(response).message("ok").build();
+    }
+
+    /**
+     * 单个订单变价
+     *
+     * @param uid
+     * @param orderCode
+     * @param price
+     * @return
+     */
     @RequestMapping(params = "method=ufo.buyer.bid.changePrice")
     @ResponseBody
-    public ApiResponse changePriceOfSingleGoods(@RequestParam(name = "uid") int uid,
+    public ApiResponse changePrice(@RequestParam(name = "uid") int uid,
                                                 @RequestParam(name = "orderCode") long orderCode,
                                                 @RequestParam(name = "price") String price,
                                                 @RequestParam(name = "channelNo", required = false) String channelNo,

@@ -66,7 +66,7 @@ public class BidAndSuggestPrice {
      * @param suggestRate 建议比例
      */
     public BigDecimal calculateSuggestPrice(BigDecimal leastPrice, double suggestRate) {
-        log.info("leastPrice:{},suggestRate:{}", leastPrice, suggestRate);
+        log.info("in BidAndSuggestPrice, leastPrice:{}, suggestRate:{}", leastPrice, suggestRate);
         String priceText = leastPrice.multiply(BigDecimal.valueOf(suggestRate)).setScale(0, BigDecimal.ROUND_DOWN).toPlainString();
         String endNumber = "9";
         if (!priceText.endsWith(endNumber)) {

@@ -104,8 +104,8 @@ public class BuyerOrderStateChangers {
         long orderCode = buyerOrder.getOrderCode();
         OrderStatus orderStatus = OrderStatus.getOrderStatus(buyerOrder.getStatus());
         if (orderStatus == null || orderStatus.getCode() != sourceStatus.getCode()) {
-            logger.warn("check status invalidate, uid is {}, orderCode is {}, status is {}",
-                    uid, orderCode, buyerOrder.getStatus());
+            logger.warn("[{}] buyer order status can't change, because current status is {},requested status is {}",
+                    orderCode, buyerOrder.getStatus(), sourceStatus.getCode());
             throw new ServiceException(ServiceError.ORDER_STATUS_INVALIDATE);
         }
         return buyerOrder;

@@ -16,6 +16,7 @@ import com.yohoufo.order.model.dto.BidPublishResult;
 import com.yohoufo.order.model.request.BuyerBidChangePriceRequest;
 import com.yohoufo.order.model.request.BuyerBidPublishRequest;
 import com.yohoufo.order.model.response.BidComputeResponse;
+import com.yohoufo.order.model.response.BidPrePublishResponse;
 import com.yohoufo.order.model.response.BidPublishResponse;
 import com.yohoufo.order.service.proxy.BidProductProxyService;
 import com.yohoufo.order.service.support.BuyerOrderMetaMapperSupport;
@@ -81,6 +82,21 @@ public class BuyerBidPriceService {
         return buyerBidPublishService.compute(req);
     }
 
+    public BidPrePublishResponse preChangePrice(BuyerBidChangePriceRequest request) {
+        int uid = request.getUid();
+        BidOrderChangePriceContext context = buildBidOrderChangePriceContext(request);
+        //校验
+        validate(context);
+        //构建参数
+        BuyerBidPublishRequest req = BuyerBidPublishRequest.builder().uid(uid)
+                .storageId(context.sellerOrderGoods.getStorageId())
+                .price(context.newPrice)
+                .skupType(context.sellerOrderGoods.getAttributes())
+                .userAddressPair(context.userAddressPair)
+                .build();
+        return buyerBidPublishService.prePublish(req);
+    }
+
     public BidPublishResponse changePrice(BuyerBidChangePriceRequest request) {
         int uid = request.getUid();
         BidOrderChangePriceContext context = buildBidOrderChangePriceContext(request);

@@ -157,7 +157,7 @@ public class BuyerBidPublishService {
                 productProxyService.getPrdPriceRange(request.getUid(), request.getStorageId()), buyerBidConfig.getBasConfig());
         //2.计算定金
         Deposit deposit = computeDeposit(bidAndSuggestPrice, buyerBidConfig.getDConfig());
-        logger.info("[{}] buyerBid compute deposit result:{}", uid, deposit);
+        logger.info("[{}] buyer bid compute deposit result:{}", uid, deposit);
 
         BidPrePublishResponse.Dialog dialog = null;
 

 datasources:
-   ufo_passport:
-      servers:
-        - 192.168.102.219:3306
-        - 192.168.102.219:3306
-      username: yh_test
-      password: 9nm0icOwt6bMHjMusIfMLw==
-      daos:
-        - com.yohoufo.dal.user.IUserAuthorizeHistoryDao
-        - com.yohoufo.dal.user.IUserAuthorizeInfoDao
-        - com.yohoufo.dal.user.IZhiMaCertDao
+  ufo_passport:
+    servers:
+      - 192.168.102.219:3306
+      - 192.168.102.219:3306
+    username: yh_test
+    password: 9nm0icOwt6bMHjMusIfMLw==
+    daos:
+      - com.yohoufo.dal.user.IUserAuthorizeHistoryDao
+      - com.yohoufo.dal.user.IUserAuthorizeInfoDao
+      - com.yohoufo.dal.user.IZhiMaCertDao
+      - com.yohoufo.dal.user.UsersNoticeMapper
 
-   ufo_product:
-      servers:
-        - 192.168.102.219:3306
-        - 192.168.102.219:3306
-      username: yh_test
-      password: 9nm0icOwt6bMHjMusIfMLw==
-      daos:
-        - com.yohoufo.dal.product.StoragePriceMapper
-        - com.yohoufo.dal.product.StorageMapper
-        - com.yohoufo.dal.product.ProductMapper
-        - com.yohoufo.dal.product.GoodsMapper
-        - com.yohoufo.dal.product.GoodsImagesMapper
-        - com.yohoufo.dal.product.SizeMapper
-        - com.yohoufo.dal.product.BrandMapper
-        - com.yohoufo.dal.product.BrandSeriesMapper
-        - com.yohoufo.dal.product.ProductSortMapper
-        - com.yohoufo.dal.product.SearchWordMapper
-        - com.yohoufo.dal.product.SaleCategoryMapper
-        - com.yohoufo.dal.product.IdentifyRecordsMapper
-        - com.yohoufo.dal.product.IdentifyRelationMapper
-        - com.yohoufo.dal.product.ProductChainMapper
-        - com.yohoufo.dal.product.PriceTrendSixtyDayMapper
-        - com.yohoufo.dal.product.PriceTrendMonthMapper
-        - com.yohoufo.dal.product.PriceTrendHalfYearMapper
-        - com.yohoufo.dal.product.PriceTrendDayMapper
-        - com.yohoufo.dal.product.ProductImportTranItemMapper
-        - com.yohoufo.dal.product.TransferRecordsMapper
-        - com.yohoufo.dal.product.TransferRecordsHistoryMapper
-        - com.yohoufo.dal.product.ProductSalesMapper
-        - com.yohoufo.dal.product.ProductLimitSaleMapper
-        - com.yohoufo.dal.product.ProductSelfShelvesMapper
-        - com.yohoufo.dal.product.ProductSelfShelvesPicMapper
-        - com.yohoufo.dal.product.SecondhandFlawMapper
-        - com.yohoufo.dal.product.SecondhandImagesMapper
-        - com.yohoufo.dal.product.SecondhandInfoMapper
-        - com.yohoufo.dal.product.SelfSizeMapper
-        - com.yohoufo.dal.product.SelfSizeUidMapper
-        - com.yohoufo.dal.product.ProductProfitMapper
-        - com.yohoufo.dal.product.ProductPoolDetailMapper
+  ufo_product:
+    servers:
+      - 192.168.102.219:3306
+      - 192.168.102.219:3306
+    username: yh_test
+    password: 9nm0icOwt6bMHjMusIfMLw==
+    daos:
+      - com.yohoufo.dal.product.StoragePriceMapper
+      - com.yohoufo.dal.product.StorageMapper
+      - com.yohoufo.dal.product.ProductMapper
+      - com.yohoufo.dal.product.GoodsMapper
+      - com.yohoufo.dal.product.GoodsImagesMapper
+      - com.yohoufo.dal.product.SizeMapper
+      - com.yohoufo.dal.product.BrandMapper
+      - com.yohoufo.dal.product.BrandSeriesMapper
+      - com.yohoufo.dal.product.ProductSortMapper
+      - com.yohoufo.dal.product.SearchWordMapper
+      - com.yohoufo.dal.product.SaleCategoryMapper
+      - com.yohoufo.dal.product.IdentifyRecordsMapper
+      - com.yohoufo.dal.product.IdentifyRelationMapper
+      - com.yohoufo.dal.product.ProductChainMapper
+      - com.yohoufo.dal.product.PriceTrendSixtyDayMapper
+      - com.yohoufo.dal.product.PriceTrendMonthMapper
+      - com.yohoufo.dal.product.PriceTrendHalfYearMapper
+      - com.yohoufo.dal.product.PriceTrendDayMapper
+      - com.yohoufo.dal.product.ProductImportTranItemMapper
+      - com.yohoufo.dal.product.TransferRecordsMapper
+      - com.yohoufo.dal.product.TransferRecordsHistoryMapper
+      - com.yohoufo.dal.product.ProductSalesMapper
+      - com.yohoufo.dal.product.ProductLimitSaleMapper
+      - com.yohoufo.dal.product.ProductSelfShelvesMapper
+      - com.yohoufo.dal.product.ProductSelfShelvesPicMapper
+      - com.yohoufo.dal.product.SecondhandFlawMapper
+      - com.yohoufo.dal.product.SecondhandImagesMapper
+      - com.yohoufo.dal.product.SecondhandInfoMapper
+      - com.yohoufo.dal.product.SelfSizeMapper
+      - com.yohoufo.dal.product.SelfSizeUidMapper
+      - com.yohoufo.dal.product.ProductProfitMapper
+      - com.yohoufo.dal.product.ProductPoolDetailMapper
+      - com.yohoufo.dal.product.BidStoragePriceMapper
 
 
-   ufo_order:
-         servers:
-           - 192.168.102.219:3306
-           - 192.168.102.219:3306
-         username: yh_test
-         password: 9nm0icOwt6bMHjMusIfMLw==
-         daos:
-           - com.yohoufo.dal.order.BuyerOrderGoodsMapper
-           - com.yohoufo.dal.order.BuyerOrderMapper
-           - com.yohoufo.dal.order.BuyerOrderMetaMapper
-           - com.yohoufo.dal.order.ExpressRecordMapper
-           - com.yohoufo.dal.order.ExpressInfoMapper
-           - com.yohoufo.dal.order.SellerOrderGoodsMapper
-           - com.yohoufo.dal.order.SellerOrderMapper
-           - com.yohoufo.dal.order.SellerOrderMetaMapper
-           - com.yohoufo.dal.order.OrdersPayMapper
-           - com.yohoufo.dal.order.OrdersPayRefundMapper
-           - com.yohoufo.dal.order.ExpressCompanyMapper
-           - com.yohoufo.dal.order.AppraiseAddressMapper
-           - com.yohoufo.dal.order.TradeBillsMapper
-           - com.yohoufo.dal.order.OrdersPayTransferMapper
-           - com.yohoufo.dal.order.ManualTransferMapper
-           - com.yohoufo.dal.order.MachineIdGenerateMapper
-           - com.yohoufo.dal.order.SkupBatchMapper
-           - com.yohoufo.dal.order.SellerWalletMapper
-           - com.yohoufo.dal.order.SellerWalletDetailMapper
-           - com.yohoufo.dal.order.OrderCouponMapper
-           - com.yohoufo.dal.order.EntrySellerRechargeOrderMapper
-           - com.yohoufo.dal.order.StoredSellerMapper
-           - com.yohoufo.dal.order.SuperEntrySellerMapper
-           - com.yohoufo.dal.order.QiniuLiveRecordMapper
-           - com.yohoufo.dal.order.SellerOrderGoodsViewMapper
-           - com.yohoufo.dal.order.SellerTaskMapper
-           - com.yohoufo.dal.order.SellerTaskDetailMapper
-           - com.yohoufo.dal.order.OrdersPrePayMapper
-           - com.yohoufo.dal.order.MetaConfigMapper
-           - com.yohoufo.dal.order.BuyerOrderStatusFlowMapper
-           - com.yohoufo.dal.order.OrderOperateRecordMapper
-           - com.yohoufo.dal.order.QualityCheckMapper
-           - com.yohoufo.dal.order.BusinessLicenseMapper
-           - com.yohoufo.dal.order.SellerEnterApplyMapper
-           - com.yohoufo.dal.order.SellerFuncMapper
-           - com.yohoufo.dal.order.SellerLevelFuncMapper
-           - com.yohoufo.dal.order.OrderOverTimeMapper
-           - com.yohoufo.dal.order.BuyerOrderViewMapper
-           - com.yohoufo.dal.order.SellerJoinHistoryMapper
-           - com.yohoufo.dal.order.SellerChangePriceRecordMapper
-           - com.yohoufo.dal.order.InviteActivityMapper
-           - com.yohoufo.dal.order.InviteRecordMapper
-           - com.yohoufo.dal.order.InviterMapper
-           - com.yohoufo.dal.order.InviteSettlementItemMapper
-           - com.yohoufo.dal.order.InviteSettlementMapper
-           - com.yohoufo.dal.order.InviteCodeSequenceMapper
-           - com.yohoufo.dal.order.InviteCodeSequenceRandomMapper
-           - com.yohoufo.dal.order.SellerGoodsStatusFlowMapper
-           - com.yohoufo.dal.order.CmsPayMapper
-           - com.yohoufo.dal.order.OrdersPayHbfqMapper
-           - com.yohoufo.dal.order.BlackUserMapper
-           - com.yohoufo.dal.order.StorageDepositMapper
-           - com.yohoufo.dal.order.DepositOrderMapper
-           - com.yohoufo.dal.order.SellerOrderStatsConfigMapper
-           - com.yohoufo.dal.order.SellerOrderStatsResultMapper
-           - com.yohoufo.dal.order.AlipayBlackUserMapper
-           - com.yohoufo.dal.order.AppraiseOrderMapper
-           - com.yohoufo.dal.order.AppraiseOrderGoodsMapper
-           - com.yohoufo.dal.order.AppraiseOrderMetaMapper
-           - com.yohoufo.dal.order.AppraiseOrderStorageMapper
-           - com.yohoufo.dal.order.DepositCodeMapper
-           - com.yohoufo.dal.order.SellerServiceFeeRuleMapper
+  ufo_order:
+    servers:
+      - 192.168.102.219:3306
+      - 192.168.102.219:3306
+    username: yh_test
+    password: 9nm0icOwt6bMHjMusIfMLw==
+    daos:
+      - com.yohoufo.dal.order.BuyerOrderGoodsMapper
+      - com.yohoufo.dal.order.BuyerOrderMapper
+      - com.yohoufo.dal.order.BuyerOrderMetaMapper
+      - com.yohoufo.dal.order.ExpressRecordMapper
+      - com.yohoufo.dal.order.ExpressInfoMapper
+      - com.yohoufo.dal.order.SellerOrderGoodsMapper
+      - com.yohoufo.dal.order.SellerOrderMapper
+      - com.yohoufo.dal.order.SellerOrderMetaMapper
+      - com.yohoufo.dal.order.OrdersPayMapper
+      - com.yohoufo.dal.order.OrdersPayRefundMapper
+      - com.yohoufo.dal.order.ExpressCompanyMapper
+      - com.yohoufo.dal.order.AppraiseAddressMapper
+      - com.yohoufo.dal.order.TradeBillsMapper
+      - com.yohoufo.dal.order.OrdersPayTransferMapper
+      - com.yohoufo.dal.order.ManualTransferMapper
+      - com.yohoufo.dal.order.MachineIdGenerateMapper
+      - com.yohoufo.dal.order.SkupBatchMapper
+      - com.yohoufo.dal.order.SellerWalletMapper
+      - com.yohoufo.dal.order.SellerWalletDetailMapper
+      - com.yohoufo.dal.order.OrderCouponMapper
+      - com.yohoufo.dal.order.EntrySellerRechargeOrderMapper
+      - com.yohoufo.dal.order.StoredSellerMapper
+      - com.yohoufo.dal.order.SuperEntrySellerMapper
+      - com.yohoufo.dal.order.QiniuLiveRecordMapper
+      - com.yohoufo.dal.order.SellerOrderGoodsViewMapper
+      - com.yohoufo.dal.order.SellerTaskMapper
+      - com.yohoufo.dal.order.SellerTaskDetailMapper
+      - com.yohoufo.dal.order.OrdersPrePayMapper
+      - com.yohoufo.dal.order.MetaConfigMapper
+      - com.yohoufo.dal.order.BuyerOrderStatusFlowMapper
+      - com.yohoufo.dal.order.OrderOperateRecordMapper
+      - com.yohoufo.dal.order.QualityCheckMapper
+      - com.yohoufo.dal.order.BusinessLicenseMapper
+      - com.yohoufo.dal.order.SellerEnterApplyMapper
+      - com.yohoufo.dal.order.SellerFuncMapper
+      - com.yohoufo.dal.order.SellerLevelFuncMapper
+      - com.yohoufo.dal.order.OrderOverTimeMapper
+      - com.yohoufo.dal.order.BuyerOrderViewMapper
+      - com.yohoufo.dal.order.SellerJoinHistoryMapper
+      - com.yohoufo.dal.order.SellerChangePriceRecordMapper
+      - com.yohoufo.dal.order.InviteActivityMapper
+      - com.yohoufo.dal.order.InviteRecordMapper
+      - com.yohoufo.dal.order.InviterMapper
+      - com.yohoufo.dal.order.InviteSettlementItemMapper
+      - com.yohoufo.dal.order.InviteSettlementMapper
+      - com.yohoufo.dal.order.InviteCodeSequenceMapper
+      - com.yohoufo.dal.order.InviteCodeSequenceRandomMapper
+      - com.yohoufo.dal.order.SellerGoodsStatusFlowMapper
+      - com.yohoufo.dal.order.CmsPayMapper
+      - com.yohoufo.dal.order.OrdersPayHbfqMapper
+      - com.yohoufo.dal.order.BlackUserMapper
+      - com.yohoufo.dal.order.StorageDepositMapper
+      - com.yohoufo.dal.order.DepositOrderMapper
+      - com.yohoufo.dal.order.SellerOrderStatsConfigMapper
+      - com.yohoufo.dal.order.SellerOrderStatsResultMapper
+      - com.yohoufo.dal.order.AlipayBlackUserMapper
+      - com.yohoufo.dal.order.AppraiseOrderMapper
+      - com.yohoufo.dal.order.AppraiseOrderGoodsMapper
+      - com.yohoufo.dal.order.AppraiseOrderMetaMapper
+      - com.yohoufo.dal.order.AppraiseOrderStorageMapper
+      - com.yohoufo.dal.order.DepositCodeMapper
+      - com.yohoufo.dal.order.SellerServiceFeeRuleMapper
+      - com.yohoufo.dal.order.BuyerOrderPromotionMapper
+      - com.yohoufo.dal.order.BuyerChangePriceRecordMapper
 
-   ufo_promotion:
-         servers:
-           - 192.168.102.219:3306
-           - 192.168.102.219:3306
-         username: yh_test
-         password: 9nm0icOwt6bMHjMusIfMLw==
-         daos:
-           - com.yohoufo.dal.promotion.CouponMapper
-           - com.yohoufo.dal.promotion.CouponProductLimitMapper
-           - com.yohoufo.dal.promotion.CouponTypeMapper
-           - com.yohoufo.dal.promotion.UserCouponMapper
+  ufo_promotion:
+    servers:
+      - 192.168.102.219:3306
+      - 192.168.102.219:3306
+    username: yh_test
+    password: 9nm0icOwt6bMHjMusIfMLw==
+    daos:
+      - com.yohoufo.dal.promotion.CouponMapper
+      - com.yohoufo.dal.promotion.CouponProductLimitMapper
+      - com.yohoufo.dal.promotion.CouponTypeMapper
+      - com.yohoufo.dal.promotion.UserCouponMapper
+      - com.yohoufo.dal.promotion.IActivityMapper
+      - com.yohoufo.dal.promotion.IActivityProductScopeMapper
+      - com.yohoufo.dal.promotion.IActivityAmountConditionMapper
 
-   ufo_resource:
-      servers:
-        - 192.168.102.219:3306
-        - 192.168.102.219:3306
-      username: yh_test
-      password: 9nm0icOwt6bMHjMusIfMLw==
-      daos:
-        - com.yohoufo.dal.resource.ResourcesContentDataMapper
-        - com.yohoufo.dal.resource.ResourcesContentMapper
-        - com.yohoufo.dal.resource.ResourcesMapper
-        - com.yohoufo.dal.resource.ConfigTypeMapper
-        - com.yohoufo.dal.resource.ResourcesGoodsPoolMapper
+  ufo_resource:
+    servers:
+      - 192.168.102.219:3306
+      - 192.168.102.219:3306
+    username: yh_test
+    password: 9nm0icOwt6bMHjMusIfMLw==
+    daos:
+      - com.yohoufo.dal.resource.ResourcesContentDataMapper
+      - com.yohoufo.dal.resource.ResourcesContentMapper
+      - com.yohoufo.dal.resource.ResourcesMapper
+      - com.yohoufo.dal.resource.ConfigTypeMapper
+      - com.yohoufo.dal.resource.ResourcesGoodsPoolMapper
 
-   line_shops:
-       servers:
-         - 192.168.102.219:3306
-         - 192.168.102.219:3306
-       username: yh_test
-       password: 9nm0icOwt6bMHjMusIfMLw==
-       daos:
-         - com.yohoufo.dal.product.IStoreInfoDAO
-         - com.yohoufo.dal.product.IStoreInfoExtendDAO
+  line_shops:
+    servers:
+      - 192.168.102.219:3306
+      - 192.168.102.219:3306
+    username: yh_test
+    password: 9nm0icOwt6bMHjMusIfMLw==
+    daos:
+      - com.yohoufo.dal.product.IStoreInfoDAO
+      - com.yohoufo.dal.product.IStoreInfoExtendDAO
 
 readOnlyInSlave: true
\ No newline at end of file