Merge branch 'test6.9.5' of http://git.yoho.cn/ufo/yohoufo-fore into test6.9.5

caoyan
Commit 3c1dd4405aaf4dc2b271038355151fd55730f260 2 parents 8ac3b1f3 5bc382aa
Showing 13 changed files with 90 additions and 118 deletions
dal/src/main/java/com/yohoufo/dal/order/SellerWalletMapper.java
dal/src/main/resources/META-INF/mybatis/order/SellerWalletMapper.xml
order/src/main/java/com/yohoufo/order/common/BillTradeStatus.java
order/src/main/java/com/yohoufo/order/service/impl/AssetsService.java
order/src/main/java/com/yohoufo/order/service/impl/PaymentServiceImpl.java
order/src/main/java/com/yohoufo/order/service/impl/SellerOrderDetailService.java
order/src/main/java/com/yohoufo/order/service/impl/SellerOrderListService.java
order/src/main/java/com/yohoufo/order/service/impl/SellerOrderViewService.java
order/src/main/java/com/yohoufo/order/service/impl/SkupListService.java
order/src/main/java/com/yohoufo/order/service/listener/BuyOrderChangeListener.java
order/src/main/java/com/yohoufo/order/service/listener/processor/BuyerOrderChangeBusinessPostProcessor.java
product/src/main/java/com/yohoufo/product/controller/test/ExampleResultFactory.java
product/src/main/java/com/yohoufo/product/controller/test/TestSynDbController.java
--- a/dal/src/main/java/com/yohoufo/dal/order/SellerWalletMapper.java
View file @3c1dd44
+++ b/dal/src/main/java/com/yohoufo/dal/order/SellerWalletMapper.java
View file @3c1dd44
@@ -26,8 +26,6 @@ public interface SellerWalletMapper {
     SellerWallet selectByUidNType(SellerWallet condition);
-    void updateMoneyForTest();
-
 	int changeAllMoneyToAvail(@Param("uid") Integer uid, @Param("updateTime") Integer updateTime);
 	int rejoin(@Param("uid") Integer uid, @Param("amount") BigDecimal amount
--- a/dal/src/main/resources/META-INF/mybatis/order/SellerWalletMapper.xml
View file @3c1dd44
+++ b/dal/src/main/resources/META-INF/mybatis/order/SellerWalletMapper.xml
View file @3c1dd44
@@ -180,8 +180,4 @@
     update seller_wallet set amount = amount + lock_amount ,lock_amount = 0,update_time = #{updateTime,jdbcType=INTEGER} where uid = #{uid}
   </update>
-  <update id="updateMoneyForTest">
-    update seller_wallet set amount = amount + 10 where id = 3
-  </update>
-  
 </mapper>
--- a/order/src/main/java/com/yohoufo/order/common/BillTradeStatus.java
View file @3c1dd44
+++ b/order/src/main/java/com/yohoufo/order/common/BillTradeStatus.java
View file @3c1dd44
 package com.yohoufo.order.common;
 /**
+ * 100:成功;200:失败，201:没有支付宝账号;202:金额不合法;299:转账失败
  * Created by chao.chen on 2018/10/24.
  */
 public enum BillTradeStatus {
-
-    SUCCESS(100),FAIL(200);
+    TRANSFER_WAITING(90),
+    SUCCESS(100),
+    FAIL(200),
+    NOT_EXIST_ALI_ACCOUNT(201),
+    AMOUNT_IS_ILLEGAL(202),
+    TRANSFER_FAIL(299);
     int code;
--- a/order/src/main/java/com/yohoufo/order/service/impl/AssetsService.java
View file @3c1dd44
+++ b/order/src/main/java/com/yohoufo/order/service/impl/AssetsService.java
View file @3c1dd44
@@ -8,6 +8,7 @@ import com.yohoufo.dal.order.TradeBillsMapper;
 import com.yohoufo.dal.order.model.BuyerOrderGoods;
 import com.yohoufo.dal.order.model.SellerOrderGoods;
 import com.yohoufo.dal.order.model.TradeBills;
+import com.yohoufo.order.common.BillTradeStatus;
 import com.yohoufo.order.common.TradeType;
 import com.yohoufo.order.model.bo.TradeBillsBo;
 import com.yohoufo.order.model.bo.TradeBillsSummaryBo;
@@ -109,7 +110,7 @@ public class AssetsService {
             bo.setTradeTypeDesc(TradeType.getTradeTypeByCode(bills.getTradeType()).getDesc());
             bo.setTradeStatus(bills.getTradeStatus());
-            if(bills.getTradeStatus()!=null&&100==bills.getTradeStatus().intValue()){
+            if(bills.getTradeStatus()!=null&&BillTradeStatus.SUCCESS.getCode() == bills.getTradeStatus().intValue()){
                 bo.setNormalFlag(true);
             }else{
                 bo.setNormalFlag(false);
--- a/order/src/main/java/com/yohoufo/order/service/impl/PaymentServiceImpl.java
View file @3c1dd44
+++ b/order/src/main/java/com/yohoufo/order/service/impl/PaymentServiceImpl.java
View file @3c1dd44
@@ -19,6 +19,7 @@ import com.yohoufo.common.utils.TimeUtils;
 import com.yohoufo.dal.order.*;
 import com.yohoufo.dal.order.model.*;
 import com.yohobuy.ufo.model.order.common.Payment;
+import com.yohoufo.order.common.BillTradeStatus;
 import com.yohoufo.order.common.HbfqEnum;
 import com.yohoufo.order.common.TransferCase;
 import com.yohoufo.order.constants.RefundContant;
@@ -356,7 +357,7 @@ public class PaymentServiceImpl implements IPaymentService {
 		if (tradeBills == null) {
 			throw new ServiceException(400, "transferSuccess：流水不存在");
 		}
-		if (tradeBills.getTradeStatus() != TradeBills.Status.TRANSFER_WAITING.getCode()) {
+		if (tradeBills.getTradeStatus() != BillTradeStatus.TRANSFER_WAITING.getCode()) {
 			throw new ServiceException(400, "transferSuccess：该流水不是异步转账的");
 		}
 		OrdersPayTransfer transfer = ordersPayTransferMapper.selectByPrimaryKey(transferId);
@@ -382,7 +383,7 @@ public class PaymentServiceImpl implements IPaymentService {
     		// 加新流水
 			tradeBills.setDealRelateId(tradeBills.getId());
 			tradeBills.setId(null);
-			tradeBills.setTradeStatus(100);
+			tradeBills.setTradeStatus(BillTradeStatus.SUCCESS.getCode());
 			tradeBills.setCreateTime(now);
 			addTradeBills(tradeBills);
@@ -399,7 +400,7 @@ public class PaymentServiceImpl implements IPaymentService {
     		TradeBills fail = new TradeBills();
     		fail.setId(tradeBills.getId());
     		fail.setDealStatus(0);
-    		fail.setTradeStatus(299);
+    		fail.setTradeStatus(BillTradeStatus.TRANSFER_FAIL.getCode());
 			tradeBillsMapper.updateSelectiveByPrimaryKey(fail);
     		logger.info("transferSuccess 旧流水（失败）更新成功，准备改转账表 tradeBillsId={}, tradeBillsId={}, orderCode={}", tradeBillsId, tradeBillsId, orderCode);
@@ -663,7 +664,7 @@ public class PaymentServiceImpl implements IPaymentService {
 		if (transferAmount == null) {
 			logger.warn("transferMonErr transferMon计算费用结果为 null, 不合法的金额");
 			alarm("转账金额不合法", "ufo.order.transferMon", "订单号：" + buyerOrderCode + "操作类型（" + transferCase.getCode() + "）计算金额结果为null");
-			record.setTradeStatus(202);
+			record.setTradeStatus(BillTradeStatus.AMOUNT_IS_ILLEGAL.getCode());
 			addTradeBills(record);
 			throw new ServiceException(400, "计算金额错误！:");
 		}
@@ -674,7 +675,7 @@ public class PaymentServiceImpl implements IPaymentService {
 		if (transferAmount.compareTo(new BigDecimal("0.1")) < 0) {
 			logger.warn("transferMonErr transferMon计算费用结果为 {}, 小于0.1", transferAmount);
 			alarm("转账金额小于0.1", "ufo.order.transferMon", "订单号：" + buyerOrderCode + "操作类型（" + transferCase.getCode() + "）计算金额结果为" + transferAmount);
-			record.setTradeStatus(202);
+			record.setTradeStatus(BillTradeStatus.AMOUNT_IS_ILLEGAL.getCode());
 			addTradeBills(record);
 			throw new ServiceException(400, "不合法的金额:" + transferAmount);
 		}
@@ -683,7 +684,7 @@ public class PaymentServiceImpl implements IPaymentService {
 		if (account == null || 
 				(StringUtils.isBlank(account.getAlipayAccount()) && StringUtils.isBlank(account.getAlipayId()))) {
 			logger.warn("transferMonErr uid {} 没有获取到有效的支付宝账号", targetUid);
-			record.setTradeStatus(201);
+			record.setTradeStatus(BillTradeStatus.NOT_EXIST_ALI_ACCOUNT.getCode());
 			addTradeBills(record);
 			throw new ServiceException(400, "uid[" + targetUid + "]没有获取到有效的支付宝账号");
 		}
@@ -775,8 +776,9 @@ public class PaymentServiceImpl implements IPaymentService {
 			logger.info("transferMon最后更新状态 status= {}", transfer.getStatus());
 			ordersPayTransferMapper.updateByPrimaryKeySelective(transfer);
 			// 100:成功;201:没有支付宝账号;202:金额不合法;299:转账失败
-			record.setTradeStatus(transfer.getStatus() == 1 ? 100 : 299);
-			tradeBillsMapper.updateSelectiveByPrimaryKey(record);
+            BillTradeStatus bts = transfer.getStatus() == 1 ? BillTradeStatus.SUCCESS : BillTradeStatus.TRANSFER_FAIL;
+            record.setTradeStatus(bts.getCode());
+            tradeBillsMapper.updateSelectiveByPrimaryKey(record);
 			logger.info("transferMon最后更新状态完成，转账结束， buyerOrderCode is {}！", buyerOrderCode);
 		}
     }
@@ -813,14 +815,14 @@ public class PaymentServiceImpl implements IPaymentService {
 		if (amount == null || amount.compareTo(new BigDecimal("0.1")) < 0) {
 			logger.warn("transAllEarnestErr transferMon计算费用结果为 {}, 小于0.1或为null", amount);
 			alarm("转账金额小于0.1或为null", "ufo.order.transAllEarnest", "退还商家入驻所有金额，订单号：" + orderCode + "操作类型（" + 6 + "）计算金额结果为" + amount);
-			record.setTradeStatus(202);
+			record.setTradeStatus(BillTradeStatus.AMOUNT_IS_ILLEGAL.getCode());
 			addTradeBills(record);
 			throw new ServiceException(400, "不合法的金额:" + amount);
 		}
 		if (StringUtils.isBlank(aliPayAccount.getAlipayAccount()) && StringUtils.isBlank(aliPayAccount.getAlipayId()) ) {
 			logger.warn("transAllEarnestErr uid {} 支付宝账号不合法", account);
-			record.setTradeStatus(201);
+			record.setTradeStatus(BillTradeStatus.NOT_EXIST_ALI_ACCOUNT.getCode());
 			addTradeBills(record);
 			throw new ServiceException(400, "uid[" + uid + "]支付宝账号不合法");
 		}
@@ -907,7 +909,8 @@ public class PaymentServiceImpl implements IPaymentService {
 			transfer.setUpdateTime(now);
 			ordersPayTransferMapper.updateByPrimaryKeySelective(transfer);
 			// 100:成功;201:没有支付宝账号;202:金额不合法;299:转账失败
-			record.setTradeStatus(transfer.getStatus() == 1 ? 100 : 299);
+            BillTradeStatus bts = transfer.getStatus() == 1 ? BillTradeStatus.SUCCESS : BillTradeStatus.TRANSFER_FAIL;
+			record.setTradeStatus( bts.getCode() );
 			tradeBillsMapper.updateSelectiveByPrimaryKey(record);
 			logger.info("transAllEarnest最后更新状态完成，转账结束， orderCode is {}！", orderCode);
 		}
@@ -989,7 +992,7 @@ public class PaymentServiceImpl implements IPaymentService {
 		if (tradeBills == null) {
 			throw new ServiceException(400, "manualDeal：流水不存在");
 		}
-		if (tradeBills.getTradeStatus() == 100) {
+		if (tradeBills.getTradeStatus() == BillTradeStatus.SUCCESS.getCode()) {
 			throw new ServiceException(400, "manualDeal：该流水不是失败的");
 		}
 		if (tradeBills.getIncomeOutcome()==null || tradeBills.getIncomeOutcome()!=1) {
@@ -1072,7 +1075,7 @@ public class PaymentServiceImpl implements IPaymentService {
 					// 加新流水
 					tradeBills.setDealRelateId(tradeBills.getId());
 					tradeBills.setId(null);
-					tradeBills.setTradeStatus(100);
+					tradeBills.setTradeStatus(BillTradeStatus.SUCCESS.getCode());
 					tradeBills.setCreateTime(now);
 					addTradeBills(tradeBills);
 					return;
@@ -1133,7 +1136,7 @@ public class PaymentServiceImpl implements IPaymentService {
 				// 加新流水
 				tradeBills.setDealRelateId(tradeBills.getId());
 				tradeBills.setId(null);
-				tradeBills.setTradeStatus(100);
+				tradeBills.setTradeStatus(BillTradeStatus.SUCCESS.getCode());
 				tradeBills.setCreateTime(now);
 				addTradeBills(tradeBills);
@@ -1181,7 +1184,7 @@ public class PaymentServiceImpl implements IPaymentService {
 		// success to wait
 		if (StringUtils.equals("T", mapResult.get("is_success"))) {
 			tradeBills.setDealStatus(0);
-			tradeBills.setTradeStatus(TradeBills.Status.TRANSFER_WAITING.getCode());
+			tradeBills.setTradeStatus(BillTradeStatus.TRANSFER_WAITING.getCode());
 			// wait
 			tradeBillsMapper.updateSelectiveByPrimaryKey(tradeBills);
 		}
@@ -1338,7 +1341,7 @@ public class PaymentServiceImpl implements IPaymentService {
 			return;
 		}
 		record.setSystemAmount(amount);// 有货收入
-		record.setTradeStatus(100);
+		record.setTradeStatus(BillTradeStatus.SUCCESS.getCode());
 		record.setCreateTime((int) (System.currentTimeMillis() / 1000));
 		addTradeBills(record);
     }
@@ -1354,7 +1357,7 @@ public class PaymentServiceImpl implements IPaymentService {
 		record.setIncomeOutcome(2);// 1:用户收入; 2:用户支出
 		record.setAmount(amount);
 		record.setSystemAmount(amount);// 有货收入
-		record.setTradeStatus(100);
+		record.setTradeStatus(BillTradeStatus.SUCCESS.getCode());
 		record.setCreateTime((int) (System.currentTimeMillis() / 1000));
 		addTradeBills(record);
     }
@@ -1385,7 +1388,7 @@ public class PaymentServiceImpl implements IPaymentService {
 		}
 		record.setSystemAmount(amount);// 有货收入
-		record.setTradeStatus(100);
+		record.setTradeStatus(BillTradeStatus.SUCCESS.getCode());
 		record.setCreateTime((int) (System.currentTimeMillis() / 1000));
 		addTradeBills(record);
     }
--- a/order/src/main/java/com/yohoufo/order/service/impl/SellerOrderDetailService.java
View file @3c1dd44
+++ b/order/src/main/java/com/yohoufo/order/service/impl/SellerOrderDetailService.java
View file @3c1dd44
@@ -372,7 +372,7 @@ public class SellerOrderDetailService extends AbsOrderDetailService implements I
                     && leastPrice.compareTo(BigDecimal.ZERO)>0){
                 goodsInfo.setLeastPrice(leastPrice);
                 goodsInfo.setSuggestMaxPrice(prdPrice.getSuggestMaxPrice());
-                goodsInfo.setLeastPriceOfSkuTips(sellerOrderViewService.buildLeastPriceTips(leastPrice));
+                goodsInfo.setLeastPriceOfSkuTips(sellerOrderViewService.buildLeastPriceTips(leastPrice, skupType));
             }
             logger.info("in resetPriceOfProduct after reset, leastPrice {},new goodsInfo {}",
                     leastPrice,   JSON.toJSONString(goodsInfo));
--- a/order/src/main/java/com/yohoufo/order/service/impl/SellerOrderListService.java
View file @3c1dd44
+++ b/order/src/main/java/com/yohoufo/order/service/impl/SellerOrderListService.java
View file @3c1dd44
@@ -3,10 +3,7 @@ package com.yohoufo.order.service.impl;
 import com.google.common.collect.Maps;
 import com.yoho.error.ServiceError;
 import com.yoho.error.exception.ServiceException;
-import com.yohobuy.ufo.model.order.bo.ButtonShowBo;
-import com.yohobuy.ufo.model.order.bo.GoodsInfo;
-import com.yohobuy.ufo.model.order.bo.OrderInfo;
-import com.yohobuy.ufo.model.order.bo.TimeoutBo;
+import com.yohobuy.ufo.model.order.bo.*;
 import com.yohobuy.ufo.model.order.common.*;
 import com.yohobuy.ufo.model.order.constants.SkupType;
 import com.yohobuy.ufo.model.order.resp.OrderListInfo;
@@ -105,15 +102,21 @@ public class SellerOrderListService extends AbsOrderListService implements IOrde
     public List<OrderListInfo> buildOrderList(List<SellerOrderGoods> sogList, SellerType sellerType){
-        Map<String, String> overPriceTipsMap = buildOverPriceTipsMap(sogList);
+        Set<Integer> storageIds = sogList.parallelStream().map(SellerOrderGoods::getStorageId)
+                .collect(Collectors.toSet());
+        Map<Integer, StorageInfoResp> getStorageDataMap = productProxyService.getStorageDataMap(storageIds);
+        Map<String, String> overPriceTipsMap = skupListService.buildOverPriceTipsMap(storageIds, sogList, getStorageDataMap);
         Map<Integer, SellerOrderGoods> skupSellerOrderGoodsMap = sogList.parallelStream()
                 .collect(Collectors.toMap(SellerOrderGoods::getId, Function.identity()));
         List<Integer> skupList = sogList.parallelStream().map(SellerOrderGoods::getId).collect(Collectors.toList());
         List<SellerOrder> sellerOrders = sellerOrderMapper.selectBySkups(skupList);
         List<OrderListInfo> data ;
         data = sellerOrders.parallelStream()
-                .map(sellerOrder -> buildOrderListInfo(skupSellerOrderGoodsMap.get(sellerOrder.getSkup()),
-                        sellerOrder, sellerType, overPriceTipsMap))
+                .map(sellerOrder -> {
+                    SellerOrderGoods psog = skupSellerOrderGoodsMap.get(sellerOrder.getSkup());
+                    StorageInfoResp storageInfoResp = getStorageDataMap.get(psog.getStorageId());
+                    return buildOrderListInfo(psog, storageInfoResp, sellerOrder, sellerType, overPriceTipsMap);
+                })
                 .filter(oli -> Objects.nonNull(oli))
                 .collect(Collectors.toList());
         return data;
@@ -219,6 +222,7 @@ public class SellerOrderListService extends AbsOrderListService implements IOrde
                             oli.setLeftTime(timeoutBo.getLeftTime());
                             oli.setTimeLimit(timeoutBo.getTimelimit());
                         }
+
                     }
                 }
             });
@@ -227,22 +231,13 @@ public class SellerOrderListService extends AbsOrderListService implements IOrde
-    /**
-     *  需要商品提供批量接口，减少db net IO, 目前的工期太短，后期再优化
-     * @param sogList
-     * @return
-     */
-    public Map<String,String> buildOverPriceTipsMap(List<SellerOrderGoods> sogList){
-        Set<Integer> storageIds = sogList.parallelStream().map(SellerOrderGoods::getStorageId)
-                .collect(Collectors.toSet());
-        Map<Integer, StorageInfoResp> getStorageDataMap = productProxyService.getStorageDataMap(storageIds);
-        Map<String,String> map = skupListService.buildOverPriceTipsMap(storageIds, sogList, getStorageDataMap);
-        return map;
-    }
-    OrderListInfo buildOrderListInfo(SellerOrderGoods sellerOrderGoods,
-                                     SellerOrder sellerOrder, SellerType st,
+
+    private OrderListInfo buildOrderListInfo(SellerOrderGoods sellerOrderGoods,
+                                     StorageInfoResp storageInfoResp,
+                                     SellerOrder sellerOrder,
+                                     SellerType st,
                                      Map<String,String> overPriceTipsMap) {
         OrderListInfo orderListInfo = new OrderListInfo();
         Long orderCode;
@@ -282,6 +277,16 @@ public class SellerOrderListService extends AbsOrderListService implements IOrde
         orderListInfo.setEarnestMoney(sellerOrder.getEarnestMoney());
         //
+        String leastPriceOfSkuTips = null;
+        if (skupType == SkupType.ADVANCE || skupType == SkupType.IN_STOCK){
+            if (storageInfoResp != null) {
+                PrdPrice prdPrice = PrdPrice.builder()
+                        .leastPrice(storageInfoResp.getLeastPrice())
+                        .preSaleLeastPrice(storageInfoResp.getPreSaleLeastPrice())
+                        .build();
+                leastPriceOfSkuTips = sellerOrderViewService.buildLeastPriceTips(prdPrice, skupType);
+            }
+        }
         GoodsInfo goodsInfo = new GoodsInfo();
         goodsInfo.setColorName(sellerOrderGoods.getColorName());
@@ -294,7 +299,7 @@ public class SellerOrderListService extends AbsOrderListService implements IOrde
         goodsInfo.setBatchNo(sellerOrderGoods.getBatchNo());
         goodsInfo.setStorageNum(storageNum);
         goodsInfo.setSkupList(sellerOrderGoods.getSkupList());
-
+        goodsInfo.setLeastPriceOfSkuTips(leastPriceOfSkuTips);
         orderListInfo.setGoodsInfo(goodsInfo);
         orderListInfo.setSecendLevelCreateTime(sellerOrder.getCreateTime());
--- a/order/src/main/java/com/yohoufo/order/service/impl/SellerOrderViewService.java
View file @3c1dd44
+++ b/order/src/main/java/com/yohoufo/order/service/impl/SellerOrderViewService.java
View file @3c1dd44
@@ -6,6 +6,7 @@ import com.yohobuy.ufo.model.order.common.ButtonShow;
 import com.yohobuy.ufo.model.order.common.SellerOrderListType;
 import com.yohobuy.ufo.model.order.common.SkupStatus;
 import com.yohobuy.ufo.model.order.common.TabType;
+import com.yohobuy.ufo.model.order.constants.SkupType;
 import com.yohobuy.ufo.model.order.resp.OrderCntResp;
 import com.yohobuy.ufo.model.response.StorageDataResp;
 import com.yohoufo.common.utils.BigDecimalHelper;
@@ -144,8 +145,30 @@ public class SellerOrderViewService {
                 .actor(orderRequest.getTabType()).build();
     }
-    String buildLeastPriceTips(BigDecimal leastPrice){
-        return "该尺码最低售价￥" + BigDecimalHelper.formatNumber(leastPrice, BigDecimalHelper.FORMAT_NOPOINT);
+    String buildLeastPriceTips(BigDecimal leastPrice, SkupType skupType){
+        String prefix = buildLeastPriceTipsPrefix(skupType);
+        return prefix==null ? null : prefix + "￥" + BigDecimalHelper.formatNumber(leastPrice, BigDecimalHelper.FORMAT_NOPOINT);
+    }
+
+    private String buildLeastPriceTipsPrefix(SkupType skupType){
+        String prefix = null;
+        switch (skupType){
+            case IN_STOCK:
+                prefix = "最低现货价";
+                break;
+            case ADVANCE:
+                prefix = "最低预售价";
+                break;
+
+        }
+        return prefix;
+    }
+
+    String buildLeastPriceTips(PrdPrice prdPrice, SkupType skupType){
+
+        BigDecimal leastPrice = prdPrice.getLeastPrice(skupType);
+
+        return buildLeastPriceTips(leastPrice, skupType);
     }
     String buildOtherLowerPriceTips(BigDecimal leastPrice){
--- a/order/src/main/java/com/yohoufo/order/service/impl/SkupListService.java
View file @3c1dd44
+++ b/order/src/main/java/com/yohoufo/order/service/impl/SkupListService.java
View file @3c1dd44
@@ -349,6 +349,7 @@ public class SkupListService {
         return popDTO;
     }
+
     private Integer findPrdOverPriceDTO(List<SellerOrderGoods> sogList, Map<Integer, StorageInfoResp> storageDataMap ){
         int total = 0;
         if (MapUtils.isEmpty(storageDataMap)){
--- a/order/src/main/java/com/yohoufo/order/service/listener/BuyOrderChangeListener.java
View file @3c1dd44
+++ b/order/src/main/java/com/yohoufo/order/service/listener/BuyOrderChangeListener.java
View file @3c1dd44
@@ -18,16 +18,16 @@ public class BuyOrderChangeListener implements IOrderChangeListener<BuyerOrderCh
         BuyerOrderChangeEvent.BizCase bizCase = changeEvent.getBizCase();
         switch (bizCase) {
             case CREATE:
-                businessPostProcessor.create(changeEvent.getBuyerOrder(), changeEvent.getBizCase(), changeEvent.getTargetStatus());
+                businessPostProcessor.fireCreate(changeEvent.getBuyerOrder(), changeEvent.getBizCase(), changeEvent.getTargetStatus());
                 break;
             case CANCEL_BYSYSAUTO:
             case CANCEL_BYBUYER:
             case CANCEL_BYCS:
             case CANCEL_BYSELLER:
-                businessPostProcessor.cancel(changeEvent.getBuyerOrder(), changeEvent.getBizCase(), changeEvent.getTargetStatus());
+                businessPostProcessor.fireCancel(changeEvent.getBuyerOrder(), changeEvent.getBizCase(), changeEvent.getTargetStatus());
                 break;
             case PAY_SUCCESS:
-                businessPostProcessor.paySuccess(changeEvent.getBuyerOrder(), changeEvent.getBizCase(), changeEvent.getTargetStatus());
+                businessPostProcessor.firePaySuccess(changeEvent.getBuyerOrder(), changeEvent.getBizCase(), changeEvent.getTargetStatus());
                 break;
             default:
                 throw new IllegalStateException("unknown bizCase" + bizCase);
--- a/order/src/main/java/com/yohoufo/order/service/listener/processor/BuyerOrderChangeBusinessPostProcessor.java
View file @3c1dd44
+++ b/order/src/main/java/com/yohoufo/order/service/listener/processor/BuyerOrderChangeBusinessPostProcessor.java
View file @3c1dd44
@@ -50,7 +50,7 @@ public class BuyerOrderChangeBusinessPostProcessor {
      * @param bizCase
      * @param targetStatus
      */
-    public void create(BuyerOrder buyerOrder, BuyerOrderChangeEvent.BizCase bizCase, OrderStatus targetStatus) {
+    public void fireCreate(BuyerOrder buyerOrder, BuyerOrderChangeEvent.BizCase bizCase, OrderStatus targetStatus) {
         BusinessProcessorContext context = buildBusinessProcessorContext(buyerOrder, bizCase, targetStatus);
         for (BusinessProcessor processor : processors) {
             try {
@@ -73,7 +73,7 @@ public class BuyerOrderChangeBusinessPostProcessor {
      * @param bizCase
      * @param targetStatus
      */
-    public void cancel(BuyerOrder buyerOrder, BuyerOrderChangeEvent.BizCase bizCase, OrderStatus targetStatus) {
+    public void fireCancel(BuyerOrder buyerOrder, BuyerOrderChangeEvent.BizCase bizCase, OrderStatus targetStatus) {
         BusinessProcessorContext context = buildBusinessProcessorContext(buyerOrder, bizCase, targetStatus);
         for (BusinessProcessor processor : processors) {
             try {
@@ -97,7 +97,7 @@ public class BuyerOrderChangeBusinessPostProcessor {
      * @param bizCase
      * @param targetStatus
      */
-    public void paySuccess(BuyerOrder buyerOrder, BuyerOrderChangeEvent.BizCase bizCase, OrderStatus targetStatus) {
+    public void firePaySuccess(BuyerOrder buyerOrder, BuyerOrderChangeEvent.BizCase bizCase, OrderStatus targetStatus) {
         BusinessProcessorContext context = buildBusinessProcessorContext(buyerOrder, bizCase, targetStatus);
         for (BusinessProcessor processor : processors) {
             try {
--- a/product/src/main/java/com/yohoufo/product/controller/test/ExampleResultFactory.java deleted 100644 → 0
View file @8ac3b1f
+++ b/product/src/main/java/com/yohoufo/product/controller/test/ExampleResultFactory.java deleted 100644 → 0
View file @8ac3b1f
-package com.yohoufo.product.controller.test;
-
-public class ExampleResultFactory {
-
-	public static Object createData() {
-		String methodName = Thread.currentThread().getStackTrace()[2].getMethodName();
-		switch (methodName) {
-		case "queryProductDetailBySKN":
-			return 1;
-		default:
-			return null;
-		}
-	}
-	
-}
--- a/product/src/main/java/com/yohoufo/product/controller/test/TestSynDbController.java deleted 100644 → 0
View file @8ac3b1f
+++ b/product/src/main/java/com/yohoufo/product/controller/test/TestSynDbController.java deleted 100644 → 0
View file @8ac3b1f
-package com.yohoufo.product.controller.test;
-
-import com.yoho.tools.docs.ApiOperation;
-import com.yohoufo.common.ApiResponse;
-import com.yohoufo.common.annotation.IgnoreSession;
-import com.yohoufo.common.annotation.IgnoreSignature;
-import com.yohoufo.dal.order.SellerWalletMapper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-import java.util.concurrent.atomic.AtomicInteger;
-
-/**
- * Created by li.ma on 2018/11/21.
- */
-@RestController
-public class TestSynDbController {
-
-    private final Logger LOG = LoggerFactory.getLogger(TestSynDbController.class);
-
-    @Autowired
-    private SellerWalletMapper sellerWalletMapperl;
-
-    private AtomicInteger count = new AtomicInteger(0);
-
-    @ApiOperation(name = "ufo.product.testSynDb", desc="测试")
-    @IgnoreSignature
-    @IgnoreSession
-    @RequestMapping(params = "method=ufo.product.testSynDb")
-    public ApiResponse testSynDb() {
-        
-        try {
-            sellerWalletMapperl.updateMoneyForTest();
-            count.addAndGet(1);
-        }catch (Throwable e) {
-            LOG.error("1999922222222344");
-        }
-
-        LOG.info("testSynDb  count is {}", count.get());
-        return new ApiResponse.ApiResponseBuilder().code(200).message("热搜词列表").build();
-    }
-}