ufo / yohoufo-fore · Commits

Go to a project

Authored by chenchao
Commit 12fc939467cf334e8fa38887206cc7b7fef085cd 1 parent 87976af5

support imperfect type

Inline Side-by-side
Showing 3 changed files with 7 additions and 5 deletions
@@ -142,7 +142,7 @@ public class BuyerOrderPaymentService extends AbstractOrderPaymentService { @@ -142,7 +142,7 @@ public class BuyerOrderPaymentService extends AbstractOrderPaymentService {
142 * 预售 142 * 预售
143 */ 143 */
144 private void processPreSaleOrder(OrderInfo orderInfo,SellerOrderGoods sellerOrderGoods){ 144 private void processPreSaleOrder(OrderInfo orderInfo,SellerOrderGoods sellerOrderGoods){
145 - //TODO 立即消息通知 145 + // 立即消息通知
146 Integer uid = orderInfo.getUid(); 146 Integer uid = orderInfo.getUid();
147 long orderCode = orderInfo.getOrderCode(); 147 long orderCode = orderInfo.getOrderCode();
148 148
@@ -153,10 +153,6 @@ public class BuyerOrderPaymentService extends AbstractOrderPaymentService { @@ -153,10 +153,6 @@ public class BuyerOrderPaymentService extends AbstractOrderPaymentService {
153 String unit = TimeUnit.HOURS.equals(tu) ? DateUtil.UNIT_HOURS : DateUtil.UNIT_DAYS; 153 String unit = TimeUnit.HOURS.equals(tu) ? DateUtil.UNIT_HOURS : DateUtil.UNIT_DAYS;
154 inBoxFacade.sellerSkupPaidByBuyer(sellerOrderGoods, orderCode, dtl, unit); 154 inBoxFacade.sellerSkupPaidByBuyer(sellerOrderGoods, orderCode, dtl, unit);
155 inBoxFacade.buyerFinishPaid(uid, orderCode, dtl, unit); 155 inBoxFacade.buyerFinishPaid(uid, orderCode, dtl, unit);
156 - Integer sellerUid = orderInfo.getSellerUid();  
157 - //TODO 35天不发货取消；  
158 -  
159 - //TODO 30天后，从第31天开始到第35天结束，发消息通知卖家  
160 156
161 // 记录此订单的发货超时时间期限点 157 // 记录此订单的发货超时时间期限点
162 int ts = DateUtil.getCurrentTimeSecond(); 158 int ts = DateUtil.getCurrentTimeSecond();
@@ -179,6 +175,8 @@ public class BuyerOrderPaymentService extends AbstractOrderPaymentService { @@ -179,6 +175,8 @@ public class BuyerOrderPaymentService extends AbstractOrderPaymentService {
179 OrderAttributes oa = OrderAttributes.getOrderAttributes(oac=orderInfo.getAttributes()); 175 OrderAttributes oa = OrderAttributes.getOrderAttributes(oac=orderInfo.getAttributes());
180 switch (oa){ 176 switch (oa){
181 case COMMON_IN_STOCK: 177 case COMMON_IN_STOCK:
  178 + case FLAW:
  179 + case SECOND_HAND:
182 processInStockOrder(orderInfo, buyerOrderGoods, sellerOrderGoods); 180 processInStockOrder(orderInfo, buyerOrderGoods, sellerOrderGoods);
183 break; 181 break;
184 case ADVANCE_SALE: 182 case ADVANCE_SALE:
@@ -102,6 +102,8 @@ public class BuyerPenaltyRuleSelector { @@ -102,6 +102,8 @@ public class BuyerPenaltyRuleSelector {
102 String stockCaseName; 102 String stockCaseName;
103 switch (orderAttributes) { 103 switch (orderAttributes) {
104 case COMMON_IN_STOCK: 104 case COMMON_IN_STOCK:
  105 + case FLAW:
  106 + case SECOND_HAND:
105 stockCaseName = "goodsInStock"; 107 stockCaseName = "goodsInStock";
106 break; 108 break;
107 case ADVANCE_SALE: 109 case ADVANCE_SALE:
@@ -77,6 +77,8 @@ public class OrdersPayService { @@ -77,6 +77,8 @@ public class OrdersPayService {
77 timelimit = TimeUtils.secondsFromTimeRange(min, tu); 77 timelimit = TimeUtils.secondsFromTimeRange(min, tu);
78 break; 78 break;
79 case COMMON_IN_STOCK: 79 case COMMON_IN_STOCK:
  80 + case FLAW:
  81 + case SECOND_HAND:
80 default: 82 default:
81 OrderOverTime orderOverTime = Optional.ofNullable(orderCode).map(orderOverTimeService::selectByOrderCode).orElse(null); 83 OrderOverTime orderOverTime = Optional.ofNullable(orderCode).map(orderOverTimeService::selectByOrderCode).orElse(null);
82 // 对于老订单来说，超时表记录无数据，则默认120小时 84 // 对于老订单来说，超时表记录无数据，则默认120小时