ufo / yohoufo-fore · Commits

Go to a project

Authored by caoyan
Commit 8e3556562cf2bdc3135a60a69a89c42ceee754f7 2 parents 215494a5 2da79dff

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

Inline Side-by-side
Showing 16 changed files with 116 additions and 62 deletions
@@ -151,8 +151,8 @@ public class SecurityInterceptor implements HandlerInterceptor, ApplicationEvent @@ -151,8 +151,8 @@ public class SecurityInterceptor implements HandlerInterceptor, ApplicationEvent
151 cacheKey = getSessionCacheKey(jSessionID, clientType, sessionType); 151 cacheKey = getSessionCacheKey(jSessionID, clientType, sessionType);
152 sessionInfo = valueOperations.get(cacheKey); 152 sessionInfo = valueOperations.get(cacheKey);
153 if(null == sessionInfo){ //如果REDIS主从延迟, 从主REDIS中获取SESSION 153 if(null == sessionInfo){ //如果REDIS主从延迟, 从主REDIS中获取SESSION
154 - cacheKey = RedisKeyBuilder.newInstance().appendFixed(SESSION_CACHE_KEY_PRE).appendVar(jSessionID);  
155 - sessionInfo = valueOperations.get(cacheKey); 154 + RedisKeyBuilder commonCacheKey = RedisKeyBuilder.newInstance().appendFixed(SESSION_CACHE_KEY_PRE).appendVar(jSessionID);
  155 + sessionInfo = valueOperations.get(commonCacheKey);
156 } 156 }
157 }catch (Exception redisException){ 157 }catch (Exception redisException){
158 //如果redis异常，直接放通 158 //如果redis异常，直接放通
@@ -161,7 +161,8 @@ public class SecurityInterceptor implements HandlerInterceptor, ApplicationEvent @@ -161,7 +161,8 @@ public class SecurityInterceptor implements HandlerInterceptor, ApplicationEvent
161 } 161 }
162 162
163 //8 session双云同步延迟时，获取用户session 163 //8 session双云同步延迟时，获取用户session
164 - if(null == sessionInfo){ 164 + //兼容处理session缓存值不为数字的情况
  165 + if(null == sessionInfo || (StringUtils.isNotEmpty(sessionInfo) && !StringUtils.isNumeric(sessionInfo))){
165 sessionInfo = this.getUserSesion(cacheKey,uid, jSessionID, clientType, sessionType); 166 sessionInfo = this.getUserSesion(cacheKey,uid, jSessionID, clientType, sessionType);
166 } 167 }
167 168
@@ -13,8 +13,18 @@ public class PriceTrendModel { @@ -13,8 +13,18 @@ public class PriceTrendModel {
13 13
14 private BigDecimal skuPrice; 14 private BigDecimal skuPrice;
15 15
  16 + public Integer getEndTime() {
  17 + return endTime;
  18 + }
  19 +
  20 + public void setEndTime(Integer endTime) {
  21 + this.endTime = endTime;
  22 + }
  23 +
16 private Integer createTime; 24 private Integer createTime;
17 25
  26 + private Integer endTime;
  27 +
18 public Integer getId() { 28 public Integer getId() {
19 return id; 29 return id;
20 } 30 }
@@ -24,7 +24,7 @@ public class ActionStatusHold { @@ -24,7 +24,7 @@ public class ActionStatusHold {
24 OrderStatus.SELLER_SEND_OUT.getCode(), 24 OrderStatus.SELLER_SEND_OUT.getCode(),
25 OrderStatus.PLATFORM_RECEIVE.getCode(), 25 OrderStatus.PLATFORM_RECEIVE.getCode(),
26 OrderStatus.PLATFORM_CHECKING.getCode(), 26 OrderStatus.PLATFORM_CHECKING.getCode(),
27 - OrderStatus.JUDGE_PASS.getCode(), 27 + //OrderStatus.JUDGE_PASS.getCode(),
28 OrderStatus.WAITING_RECEIVE.getCode(), 28 OrderStatus.WAITING_RECEIVE.getCode(),
29 OrderStatus.DONE.getCode(), 29 OrderStatus.DONE.getCode(),
30 OrderStatus.CHECKING_FAKE.getCode(), 30 OrderStatus.CHECKING_FAKE.getCode(),
@@ -58,7 +58,7 @@ public class ActionStatusHold { @@ -58,7 +58,7 @@ public class ActionStatusHold {
58 OrderStatus.PLATFORM_CHECKING.getCode(), 58 OrderStatus.PLATFORM_CHECKING.getCode(),
59 OrderStatus.WAITING_RECEIVE.getCode(), 59 OrderStatus.WAITING_RECEIVE.getCode(),
60 OrderStatus.PLATFORM_RECEIVE.getCode(), 60 OrderStatus.PLATFORM_RECEIVE.getCode(),
61 - OrderStatus.JUDGE_PASS.getCode(), 61 + //OrderStatus.JUDGE_PASS.getCode(),
62 OrderStatus.BUYER_CANCEL_BEFORE_SELLER_DELIVER.getCode(), 62 OrderStatus.BUYER_CANCEL_BEFORE_SELLER_DELIVER.getCode(),
63 OrderStatus.BUYER_CANCEL_BEFORE_DEPOT_RECEIVE.getCode()); 63 OrderStatus.BUYER_CANCEL_BEFORE_DEPOT_RECEIVE.getCode());
64 } 64 }
@@ -89,7 +89,7 @@ public class ActionStatusHold { @@ -89,7 +89,7 @@ public class ActionStatusHold {
89 final static List<Integer> View_Express_Status = Arrays.asList(OrderStatus.SELLER_SEND_OUT.getCode(), 89 final static List<Integer> View_Express_Status = Arrays.asList(OrderStatus.SELLER_SEND_OUT.getCode(),
90 OrderStatus.PLATFORM_RECEIVE.getCode(), 90 OrderStatus.PLATFORM_RECEIVE.getCode(),
91 OrderStatus.PLATFORM_CHECKING.getCode(), 91 OrderStatus.PLATFORM_CHECKING.getCode(),
92 - OrderStatus.JUDGE_PASS.getCode(), 92 + //OrderStatus.JUDGE_PASS.getCode(),
93 OrderStatus.CHECKING_FAKE.getCode(), 93 OrderStatus.CHECKING_FAKE.getCode(),
94 OrderStatus.WAITING_RECEIVE.getCode(),OrderStatus.DONE.getCode(), 94 OrderStatus.WAITING_RECEIVE.getCode(),OrderStatus.DONE.getCode(),
95 OrderStatus.BUYER_CANCEL_BEFORE_DEPOT_RECEIVE.getCode()); 95 OrderStatus.BUYER_CANCEL_BEFORE_DEPOT_RECEIVE.getCode());
@@ -40,33 +40,6 @@ public class AppraiseController { @@ -40,33 +40,6 @@ public class AppraiseController {
40 } 40 }
41 41
42 /** 42 /**
43 - * 鉴定中心鉴定通过后，发货  
44 - * 提供给运营平台使用  
45 - * @return  
46 - */  
47 - @RequestMapping(value="/deliverGoods")  
48 - @IgnoreSession  
49 - @IgnoreSignature  
50 - public ApiResponse deliverGoods(@RequestBody AppraiseExpressInfoBo appraiseExpressInfoBo) {  
51 - logger.info("in deliverGoods , req {}", appraiseExpressInfoBo);  
52 - appraiseService.deliverGoods(appraiseExpressInfoBo);  
53 - return new ApiResponse();  
54 - }  
55 -  
56 - /**  
57 - * 鉴定中心鉴定不通过后，寄回  
58 - * 提供给运营平台使用  
59 - * @return  
60 - */  
61 - @RequestMapping(value="/returnBackOrderCauseOfJudgeFailure")  
62 - @IgnoreSession  
63 - @IgnoreSignature  
64 - public ApiResponse returnBackOrderCauseOfJudgeFailure(@RequestBody AppraiseExpressInfoBo appraiseExpressInfoBo) {  
65 - logger.info("in returnBackOrderCauseOfJudgeFailure , req {}", appraiseExpressInfoBo);  
66 - appraiseService.returnBackOrderCauseOfJudgeFailure(appraiseExpressInfoBo);  
67 - return new ApiResponse();  
68 - }  
69 - /**  
70 * 卖家发货后，买家又取消了订单,鉴定中心寄回商品给卖家 43 * 卖家发货后，买家又取消了订单,鉴定中心寄回商品给卖家
71 * 提供给运营平台使用 44 * 提供给运营平台使用
72 * @return 45 * @return
@@ -92,6 +65,21 @@ public class AppraiseController { @@ -92,6 +65,21 @@ public class AppraiseController {
92 return appraiseService.appraiseFail(appraiseExpressInfoBo.getExpressCompanyId(), appraiseExpressInfoBo.getOrderCode(), appraiseExpressInfoBo.getWayBillCode(),appraiseExpressInfoBo.getDepotNum(),appraiseExpressInfoBo.getMobile()); 65 return appraiseService.appraiseFail(appraiseExpressInfoBo.getExpressCompanyId(), appraiseExpressInfoBo.getOrderCode(), appraiseExpressInfoBo.getWayBillCode(),appraiseExpressInfoBo.getDepotNum(),appraiseExpressInfoBo.getMobile());
93 } 66 }
94 67
  68 +
  69 + /**
  70 + * 鉴定中心鉴定不通过后，寄回
  71 + * 提供给运营平台使用
  72 + * @return
  73 + */
  74 + @RequestMapping(value="/returnBackOrderCauseOfJudgeFailure")
  75 + @IgnoreSession
  76 + @IgnoreSignature
  77 + public ApiResponse returnBackOrderCauseOfJudgeFailure(@RequestBody AppraiseExpressInfoBo appraiseExpressInfoBo) {
  78 + logger.info("in returnBackOrderCauseOfJudgeFailure , req {}", appraiseExpressInfoBo);
  79 + appraiseService.returnBackOrderCauseOfJudgeFailure(appraiseExpressInfoBo);
  80 + return new ApiResponse();
  81 + }
  82 +
95 /** 83 /**
96 * 鉴定通过,鉴定中心发货给买家 84 * 鉴定通过,鉴定中心发货给买家
97 * @return 85 * @return
@@ -104,4 +92,21 @@ public class AppraiseController { @@ -104,4 +92,21 @@ public class AppraiseController {
104 return appraiseService.appraiseSuccess(appraiseExpressInfoBo.getExpressCompanyId(), appraiseExpressInfoBo.getOrderCode(), appraiseExpressInfoBo.getWayBillCode(),appraiseExpressInfoBo.getDepotNum(),appraiseExpressInfoBo.getMobile()); 92 return appraiseService.appraiseSuccess(appraiseExpressInfoBo.getExpressCompanyId(), appraiseExpressInfoBo.getOrderCode(), appraiseExpressInfoBo.getWayBillCode(),appraiseExpressInfoBo.getDepotNum(),appraiseExpressInfoBo.getMobile());
105 } 93 }
106 94
  95 + /*
  96 + * 鉴定中心鉴定通过后，发货
  97 + * 提供给运营平台使用
  98 + *
  99 + * 鉴定通过后直接发货
  100 + *
  101 + * @return
  102 + */
  103 + /*@RequestMapping(value="/deliverGoods")
  104 + @IgnoreSession
  105 + @IgnoreSignature
  106 + public ApiResponse deliverGoods(@RequestBody AppraiseExpressInfoBo appraiseExpressInfoBo) {
  107 + logger.info("in deliverGoods , req {}", appraiseExpressInfoBo);
  108 + appraiseService.deliverGoods(appraiseExpressInfoBo);
  109 + return new ApiResponse();
  110 + }*/
  111 +
107 } 112 }
@@ -257,13 +257,13 @@ public class BuyerOrderController { @@ -257,13 +257,13 @@ public class BuyerOrderController {
257 257
258 @IgnoreSession 258 @IgnoreSession
259 @IgnoreSignature 259 @IgnoreSignature
260 - @RequestMapping(value = "/erp/judgeBegin") 260 + @RequestMapping(value = "/erp/qualityCheckPass")
261 @ResponseBody 261 @ResponseBody
262 - public ApiResponse judgeBegin(@RequestBody OrderRequest request) {  
263 - LOG.info("method ufo.depot.judgeBegin in, req is {}", request);  
264 - buyerOrderService.judgeBegin(request.getOrderCode());  
265 - LOG.info("method ufo.depot.judgeBegin out, req is {}", request);  
266 - return new ApiResponse.ApiResponseBuilder().code(200).message("鉴定中心开始鉴定成功").build(); 262 + public ApiResponse qualityCheckPass(@RequestBody OrderRequest request) {
  263 + LOG.info("method ufo.depot.qualityCheckPass in, req is {}", request);
  264 + buyerOrderService.qualityCheckPass(request.getOrderCode());
  265 + LOG.info("method ufo.depot.qualityCheckPass out, req is {}", request);
  266 + return new ApiResponse.ApiResponseBuilder().code(200).message("鉴定中心质检通过成功").build();
267 } 267 }
268 268
269 @RequestMapping(params = "method=ufo.buyer.computeCompensate") 269 @RequestMapping(params = "method=ufo.buyer.computeCompensate")
@@ -54,7 +54,7 @@ public interface IBuyerOrderService extends IOrderListService, IOrderDetailServi @@ -54,7 +54,7 @@ public interface IBuyerOrderService extends IOrderListService, IOrderDetailServi
54 54
55 void confirmReceive(long orderCode); 55 void confirmReceive(long orderCode);
56 56
57 - void judgeBegin(long orderCode); 57 + void qualityCheckPass(long orderCode);
58 58
59 OrderCntResp getOrderCnt(OrderRequest req, OrderListType listType); 59 OrderCntResp getOrderCnt(OrderRequest req, OrderListType listType);
60 } 60 }
@@ -94,7 +94,7 @@ public interface IExpressInfoService { @@ -94,7 +94,7 @@ public interface IExpressInfoService {
94 ExpressInfoDetail getLastExpressInfoDetail(TabType actor,int status, Long orderCode); 94 ExpressInfoDetail getLastExpressInfoDetail(TabType actor,int status, Long orderCode);
95 95
96 List<Integer> status2OnlySellerExpressType = Arrays.asList(OrderStatus.PLATFORM_RECEIVE.getCode(), 96 List<Integer> status2OnlySellerExpressType = Arrays.asList(OrderStatus.PLATFORM_RECEIVE.getCode(),
97 - OrderStatus.PLATFORM_CHECKING.getCode(),OrderStatus.JUDGE_PASS.getCode(), OrderStatus.WAITING_RECEIVE.getCode(), 97 + OrderStatus.PLATFORM_CHECKING.getCode(), OrderStatus.WAITING_RECEIVE.getCode(),
98 OrderStatus.DONE.getCode()); 98 OrderStatus.DONE.getCode());
99 99
100 /** 100 /**
@@ -117,7 +117,7 @@ public interface IExpressInfoService { @@ -117,7 +117,7 @@ public interface IExpressInfoService {
117 List<Integer> status2BuyerDeliverExpressStatusList = Arrays.asList( 117 List<Integer> status2BuyerDeliverExpressStatusList = Arrays.asList(
118 OrderStatus.PLATFORM_RECEIVE.getCode(), 118 OrderStatus.PLATFORM_RECEIVE.getCode(),
119 OrderStatus.PLATFORM_CHECKING.getCode(), 119 OrderStatus.PLATFORM_CHECKING.getCode(),
120 - OrderStatus.JUDGE_PASS.getCode(), 120 + //OrderStatus.JUDGE_PASS.getCode(),
121 OrderStatus.CHECKING_FAKE.getCode(), 121 OrderStatus.CHECKING_FAKE.getCode(),
122 OrderStatus.BUYER_CANCEL_BEFORE_DEPOT_RECEIVE.getCode() 122 OrderStatus.BUYER_CANCEL_BEFORE_DEPOT_RECEIVE.getCode()
123 ); 123 );
@@ -108,7 +108,7 @@ public class AppraiseService { @@ -108,7 +108,7 @@ public class AppraiseService {
108 throw new ServiceException(ServiceError.ORDER_NULL); 108 throw new ServiceException(ServiceError.ORDER_NULL);
109 } 109 }
110 final OrderStatus expectOrderStatus = OrderStatus.PLATFORM_CHECKING; 110 final OrderStatus expectOrderStatus = OrderStatus.PLATFORM_CHECKING;
111 - final OrderStatus targetOrderStatus = OrderStatus.JUDGE_PASS; 111 + final OrderStatus targetOrderStatus = OrderStatus.WAITING_RECEIVE;
112 if (expectOrderStatus.getCode() != buyerOrder.getStatus().intValue()){ 112 if (expectOrderStatus.getCode() != buyerOrder.getStatus().intValue()){
113 LOGGER.warn("in appraiseSuccess, buyer Order orderCode {} pstatus {}, expect Order Status {}", 113 LOGGER.warn("in appraiseSuccess, buyer Order orderCode {} pstatus {}, expect Order Status {}",
114 orderCode, buyerOrder.getStatus(), expectOrderStatus); 114 orderCode, buyerOrder.getStatus(), expectOrderStatus);
@@ -196,8 +196,8 @@ public class AppraiseService { @@ -196,8 +196,8 @@ public class AppraiseService {
196 BuyerConfirmEvent buyerConfirmEvent = BuyerConfirmEvent.builder().uid(buyerUid).orderCode(orderCode).build(); 196 BuyerConfirmEvent buyerConfirmEvent = BuyerConfirmEvent.builder().uid(buyerUid).orderCode(orderCode).build();
197 EventBusPublisher.publishEvent(buyerConfirmEvent); 197 EventBusPublisher.publishEvent(buyerConfirmEvent);
198 //记录物流信息 198 //记录物流信息
199 - //不发物流  
200 - //expressInfoService.appraiseSuccess(buyerUid, expressCompanyId, orderCode, wayBillCode, depotNum,mobile); 199 + //发物流
  200 + expressInfoService.deliverGoods(buyerUid, expressCompanyId, orderCode, wayBillCode, depotNum,mobile);
201 201
202 //记录订单的状态变更信息 202 //记录订单的状态变更信息
203 LOGGER.info("in appraiseSuccess record status change, orderCode {},uid {} ,sellerUid {}", orderCode,buyerUid,sellerUid); 203 LOGGER.info("in appraiseSuccess record status change, orderCode {},uid {} ,sellerUid {}", orderCode,buyerUid,sellerUid);
@@ -293,13 +293,13 @@ public class AppraiseService { @@ -293,13 +293,13 @@ public class AppraiseService {
293 } 293 }
294 } 294 }
295 295
296 - /** 296 + /*
297 * 发货 297 * 发货
298 * （1）更新订单状态 298 * （1）更新订单状态
299 * （2）记录物流 299 * （2）记录物流
300 * （3）消息 300 * （3）消息
301 */ 301 */
302 - public void deliverGoods(AppraiseExpressInfoBo appraiseExpressInfoBo){ 302 + /*public void deliverGoods(AppraiseExpressInfoBo appraiseExpressInfoBo){
303 Integer expressCompanyId = appraiseExpressInfoBo.getExpressCompanyId(); 303 Integer expressCompanyId = appraiseExpressInfoBo.getExpressCompanyId();
304 Long orderCode=appraiseExpressInfoBo.getOrderCode(); 304 Long orderCode=appraiseExpressInfoBo.getOrderCode();
305 String wayBillCode=appraiseExpressInfoBo.getWayBillCode(); 305 String wayBillCode=appraiseExpressInfoBo.getWayBillCode();
@@ -362,7 +362,7 @@ public class AppraiseService { @@ -362,7 +362,7 @@ public class AppraiseService {
362 buyerOrder.getStatus(), orderCode); 362 buyerOrder.getStatus(), orderCode);
363 throw new UfoServiceException(400,"更新订单状态失败"); 363 throw new UfoServiceException(400,"更新订单状态失败");
364 } 364 }
365 - } 365 + }*/
366 366
367 /** 367 /**
368 * 鉴定不通过退回 368 * 鉴定不通过退回
@@ -563,8 +563,9 @@ public class AppraiseService { @@ -563,8 +563,9 @@ public class AppraiseService {
563 LOGGER.warn("in appraiseFail orderStatusFlowService or notice fail orderCode {}", orderCode, ex); 563 LOGGER.warn("in appraiseFail orderStatusFlowService or notice fail orderCode {}", orderCode, ex);
564 }finally { 564 }finally {
565 //更新物流信息,写到最后 565 //更新物流信息,写到最后
566 - //鉴定不通过，不发物流  
567 - //expressInfoService.appraiseFail(sellerUid, expressCompanyId, orderCode, wayBillCode, depotNum,mobile); 566 + //鉴定不通过，发物流
  567 + expressInfoService.returnBackOrderCauseOfJudgeFailure(sellerUid, expressCompanyId, orderCode, wayBillCode, depotNum,mobile);
  568 +
568 //记录调拨信息(只保存卖家一条) 569 //记录调拨信息(只保存卖家一条)
569 EnumExpressType expressType = EnumExpressType.EXPRESS_TYPE_JUDGE_CENTER; 570 EnumExpressType expressType = EnumExpressType.EXPRESS_TYPE_JUDGE_CENTER;
570 EnumExpressDataType expressDataType = EnumExpressDataType.operate_transfer; 571 EnumExpressDataType expressDataType = EnumExpressDataType.operate_transfer;
@@ -712,8 +712,8 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService { @@ -712,8 +712,8 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
712 } 712 }
713 713
714 @Override 714 @Override
715 - public void judgeBegin(long orderCode){  
716 - logger.info("in judgeBegin, orderCode {}", orderCode); 715 + public void qualityCheckPass(long orderCode){
  716 + logger.info("in qualityCheckPass, orderCode {}", orderCode);
717 OrderStatus expectStatus = OrderStatus.PLATFORM_RECEIVE; 717 OrderStatus expectStatus = OrderStatus.PLATFORM_RECEIVE;
718 OrderStatus targetStatus = OrderStatus.PLATFORM_CHECKING; 718 OrderStatus targetStatus = OrderStatus.PLATFORM_CHECKING;
719 BuyerOrder buyerOrder = buyerOrderMapper.selectByOrderCode(orderCode); 719 BuyerOrder buyerOrder = buyerOrderMapper.selectByOrderCode(orderCode);
@@ -721,16 +721,16 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService { @@ -721,16 +721,16 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
721 if (buyerOrder != null && buyerOrder.getStatus() == expectStatus.getCode()){ 721 if (buyerOrder != null && buyerOrder.getStatus() == expectStatus.getCode()){
722 int uid = buyerOrder.getUid(); 722 int uid = buyerOrder.getUid();
723 int sellerUid = buyerOrder.getSellerUid(); 723 int sellerUid = buyerOrder.getSellerUid();
724 - logger.info("in judgeBegin begin update status orderCode {},uid {} ,sellerUid {}", orderCode,uid,sellerUid); 724 + logger.info("in qualityCheckPass begin update status orderCode {},uid {} ,sellerUid {}", orderCode,uid,sellerUid);
725 int num=buyerOrderMapper.updateStatusByOrderCode(orderCode, uid, expectStatus.getCode(), 725 int num=buyerOrderMapper.updateStatusByOrderCode(orderCode, uid, expectStatus.getCode(),
726 targetStatus.getCode(), DateUtil.getCurrentTimeSecond()); 726 targetStatus.getCode(), DateUtil.getCurrentTimeSecond());
727 727
728 //记录订单的状态变更信息 728 //记录订单的状态变更信息
729 if(num>=1){ 729 if(num>=1){
730 - logger.info("in judgeBegin record status change, orderCode {},uid {} ,sellerUid {}", orderCode,uid,sellerUid); 730 + logger.info("in qualityCheckPass record status change, orderCode {},uid {} ,sellerUid {}", orderCode,uid,sellerUid);
731 orderStatusFlowService.addAsy(buyerOrder.getOrderCode(),targetStatus.getCode()); 731 orderStatusFlowService.addAsy(buyerOrder.getOrderCode(),targetStatus.getCode());
732 }else{ 732 }else{
733 - logger.warn("in judgeBegin not record status change cause of update empty num , orderCode {},uid {} ,sellerUid {}", orderCode,uid,sellerUid); 733 + logger.warn("in qualityCheckPass not record status change cause of update empty num , orderCode {},uid {} ,sellerUid {}", orderCode,uid,sellerUid);
734 } 734 }
735 735
736 //记录调拨信息(只保存卖家一条) 736 //记录调拨信息(只保存卖家一条)
@@ -385,7 +385,6 @@ public class ExpressInfoServiceImpl implements IExpressInfoService { @@ -385,7 +385,6 @@ public class ExpressInfoServiceImpl implements IExpressInfoService {
385 //6.根据状态重设expressType 385 //6.根据状态重设expressType
386 if(Objects.equals(OrderStatus.PLATFORM_RECEIVE.getCode(),buyerOrder.getStatus()) 386 if(Objects.equals(OrderStatus.PLATFORM_RECEIVE.getCode(),buyerOrder.getStatus())
387 ||Objects.equals(OrderStatus.PLATFORM_CHECKING.getCode(),buyerOrder.getStatus()) 387 ||Objects.equals(OrderStatus.PLATFORM_CHECKING.getCode(),buyerOrder.getStatus())
388 - ||Objects.equals(OrderStatus.JUDGE_PASS.getCode(),buyerOrder.getStatus())  
389 ){ 388 ){
390 expressInfoRespBo.setExpressType(EnumExpressType.EXPRESS_TYPE_JUDGE_CENTER.getCode().byteValue()); 389 expressInfoRespBo.setExpressType(EnumExpressType.EXPRESS_TYPE_JUDGE_CENTER.getCode().byteValue());
391 } 390 }
@@ -404,7 +403,7 @@ public class ExpressInfoServiceImpl implements IExpressInfoService { @@ -404,7 +403,7 @@ public class ExpressInfoServiceImpl implements IExpressInfoService {
404 ||OrderStatus.PLATFORM_CHECKING.getCode()==status){ 403 ||OrderStatus.PLATFORM_CHECKING.getCode()==status){
405 seller_send_out_stage.setEnable(true); 404 seller_send_out_stage.setEnable(true);
406 judge_stage.setEnable(true); 405 judge_stage.setEnable(true);
407 - }else if(OrderStatus.JUDGE_PASS.getCode()==status||OrderStatus.WAITING_RECEIVE.getCode()==status||OrderStatus.DONE.getCode()==status){ 406 + }else if(OrderStatus.WAITING_RECEIVE.getCode()==status||OrderStatus.DONE.getCode()==status){
408 seller_send_out_stage.setEnable(true); 407 seller_send_out_stage.setEnable(true);
409 judge_stage.setEnable(true); 408 judge_stage.setEnable(true);
410 platform_delivery_stage.setEnable(true); 409 platform_delivery_stage.setEnable(true);
@@ -468,7 +467,7 @@ public class ExpressInfoServiceImpl implements IExpressInfoService { @@ -468,7 +467,7 @@ public class ExpressInfoServiceImpl implements IExpressInfoService {
468 if(OrderStatus.SELLER_SEND_OUT.getCode()==status 467 if(OrderStatus.SELLER_SEND_OUT.getCode()==status
469 ||OrderStatus.PLATFORM_RECEIVE.getCode()==status 468 ||OrderStatus.PLATFORM_RECEIVE.getCode()==status
470 ||OrderStatus.PLATFORM_CHECKING.getCode()==status 469 ||OrderStatus.PLATFORM_CHECKING.getCode()==status
471 - ||OrderStatus.JUDGE_PASS.getCode()==status){ 470 + ){
472 return EnumExpressType.EXPRESS_TYPE_1.getCode(); 471 return EnumExpressType.EXPRESS_TYPE_1.getCode();
473 }else if(OrderStatus.WAITING_RECEIVE.getCode()==status||OrderStatus.DONE.getCode()==status){ 472 }else if(OrderStatus.WAITING_RECEIVE.getCode()==status||OrderStatus.DONE.getCode()==status){
474 //4 和 5 状态有问题 ，买家查看物流是没问题的，卖家查看物流有问题啊. 473 //4 和 5 状态有问题 ，买家查看物流是没问题的，卖家查看物流有问题啊.
@@ -18,6 +18,16 @@ public class PriceTrendResp { @@ -18,6 +18,16 @@ public class PriceTrendResp {
18 18
19 private String createTime; 19 private String createTime;
20 20
  21 + private String endTime;
  22 +
  23 + public String getEndTime() {
  24 + return endTime;
  25 + }
  26 +
  27 + public void setEndTime(String endTime) {
  28 + this.endTime = endTime;
  29 + }
  30 +
21 public Integer getId() { 31 public Integer getId() {
22 return id; 32 return id;
23 } 33 }
@@ -81,6 +91,16 @@ public class PriceTrendResp { @@ -81,6 +91,16 @@ public class PriceTrendResp {
81 91
82 private String createTime; 92 private String createTime;
83 93
  94 + private String endTime;
  95 +
  96 + public String getEndTime() {
  97 + return endTime;
  98 + }
  99 +
  100 + public Builder setEndTime(String endTime) {
  101 + this.endTime = endTime;
  102 + return this;
  103 + }
84 104
85 public PriceTrendResp build() { 105 public PriceTrendResp build() {
86 PriceTrendResp resp = new PriceTrendResp(); 106 PriceTrendResp resp = new PriceTrendResp();
@@ -89,6 +109,7 @@ public class PriceTrendResp { @@ -89,6 +109,7 @@ public class PriceTrendResp {
89 resp.setSizeId(this.sizeId); 109 resp.setSizeId(this.sizeId);
90 resp.setProductId(this.productId); 110 resp.setProductId(this.productId);
91 resp.setCreateTime(this.createTime); 111 resp.setCreateTime(this.createTime);
  112 + resp.setEndTime(this.endTime);
92 return resp; 113 return resp;
93 } 114 }
94 115
@@ -60,6 +60,7 @@ public class ProductPriceService implements ApplicationContextAware{ @@ -60,6 +60,7 @@ public class ProductPriceService implements ApplicationContextAware{
60 .setSknPrice(item.getSknPrice()) 60 .setSknPrice(item.getSknPrice())
61 .setSkuPrice(item.getSkuPrice()) 61 .setSkuPrice(item.getSkuPrice())
62 .setCreateTime(DateUtil.getDateFormatEx(item.getCreateTime(), DateUtil.yyyy_MM_dd_HH_mm_SS)) 62 .setCreateTime(DateUtil.getDateFormatEx(item.getCreateTime(), DateUtil.yyyy_MM_dd_HH_mm_SS))
  63 + .setEndTime(DateUtil.getDateFormatEx(item.getEndTime(), DateUtil.yyyy_MM_dd_HH_mm_SS))
63 .build()) 64 .build())
64 ); 65 );
65 66
@@ -29,7 +29,11 @@ public class PriceTrendDayService implements PriceTrendServiceInf{ @@ -29,7 +29,11 @@ public class PriceTrendDayService implements PriceTrendServiceInf{
29 29
30 LOG.info("method priceTrendDayMapper.selectByProductId in, productId:{},sizeId:{},currentSecond:{},tomorrowSecond:{}", productId, sizeId, currentSecond, tomorrowSecond); 30 LOG.info("method priceTrendDayMapper.selectByProductId in, productId:{},sizeId:{},currentSecond:{},tomorrowSecond:{}", productId, sizeId, currentSecond, tomorrowSecond);
31 31
32 - return priceTrendDayMapper.selectByProductId(productId, sizeId, currentSecond, tomorrowSecond); 32 + List<PriceTrendModel> priceTrendModels = priceTrendDayMapper.selectByProductId(productId, sizeId, currentSecond, tomorrowSecond);
  33 +
  34 + priceTrendModels.stream().forEach(item -> item.setEndTime(null == item.getCreateTime() ? null : 7200 + item.getCreateTime()));
  35 +
  36 + return priceTrendModels;
33 } 37 }
34 38
35 return Lists.newArrayList(); 39 return Lists.newArrayList();
@@ -19,7 +19,13 @@ public class PriceTrendHalfYearService implements PriceTrendServiceInf{ @@ -19,7 +19,13 @@ public class PriceTrendHalfYearService implements PriceTrendServiceInf{
19 19
20 public List<PriceTrendModel> queryProductPriceTrend(Integer productId, Integer sizeId) { 20 public List<PriceTrendModel> queryProductPriceTrend(Integer productId, Integer sizeId) {
21 if (null != productId) { 21 if (null != productId) {
22 - return priceTrendHalfYearMapper.selectByProductId(productId, sizeId, DateUtil.getTimeSecondOfDay(-180), DateUtil.getTimeSecondOfDay(0)); 22 + List<PriceTrendModel> priceTrendModels = priceTrendHalfYearMapper.selectByProductId(productId, sizeId, DateUtil.getTimeSecondOfDay(-180), DateUtil.getTimeSecondOfDay(0));
  23 +
  24 + priceTrendModels.stream().forEach(item -> item.setEndTime(null == item.getCreateTime() ? null : 259200 + item.getCreateTime()));
  25 +
  26 + return priceTrendModels;
  27 +
  28 +
23 } 29 }
24 30
25 return Lists.newArrayList(); 31 return Lists.newArrayList();
@@ -21,7 +21,11 @@ public class PriceTrendMonthService implements PriceTrendServiceInf{ @@ -21,7 +21,11 @@ public class PriceTrendMonthService implements PriceTrendServiceInf{
21 21
22 public List<PriceTrendModel> queryProductPriceTrend(Integer productId, Integer sizeId) { 22 public List<PriceTrendModel> queryProductPriceTrend(Integer productId, Integer sizeId) {
23 if (null != productId) { 23 if (null != productId) {
24 - return priceTrendMonthMapper.selectByProductId(productId, sizeId, DateUtil.getTimeSecondOfDay(-30), DateUtil.getTimeSecondOfDay(0)); 24 + List<PriceTrendModel> priceTrendModels = priceTrendMonthMapper.selectByProductId(productId, sizeId, DateUtil.getTimeSecondOfDay(-30), DateUtil.getTimeSecondOfDay(0));
  25 +
  26 + priceTrendModels.stream().forEach(item -> item.setEndTime(null == item.getCreateTime() ? null : 43200 + item.getCreateTime()));
  27 +
  28 + return priceTrendModels;
25 } 29 }
26 30
27 return Lists.newArrayList(); 31 return Lists.newArrayList();
@@ -19,7 +19,9 @@ public class PriceTrendSixtyDayService implements PriceTrendServiceInf{ @@ -19,7 +19,9 @@ public class PriceTrendSixtyDayService implements PriceTrendServiceInf{
19 19
20 public List<PriceTrendModel> queryProductPriceTrend(Integer productId, Integer sizeId) { 20 public List<PriceTrendModel> queryProductPriceTrend(Integer productId, Integer sizeId) {
21 if (null != productId) { 21 if (null != productId) {
22 - return priceTrendSixtyDayMapper.selectByProductId(productId, sizeId, DateUtil.getTimeSecondOfDay(-30), DateUtil.getTimeSecondOfDay(0)); 22 + List<PriceTrendModel> priceTrendModels = priceTrendSixtyDayMapper.selectByProductId(productId, sizeId, DateUtil.getTimeSecondOfDay(-30), DateUtil.getTimeSecondOfDay(0));
  23 + priceTrendModels.stream().forEach(item -> item.setEndTime(null == item.getCreateTime() ? null : 86400 + item.getCreateTime()));
  24 + return priceTrendModels;
23 } 25 }
24 26
25 return Lists.newArrayList(); 27 return Lists.newArrayList();