Authored by chenchao

fix status

... ... @@ -130,6 +130,7 @@ public class ErpGWOrderController {
@IgnoreSession
@IgnoreSignature
@RequestMapping(value = "/qualityCheckPass")
@Deprecated
public ApiResponse qualityCheckPass(@RequestBody OrderRequest request) {
LOG.info("method ufo.depot.qualityCheckPass in, req is {}", request);
buyerOrderService.qualityCheckPass(request.getOrderCode());
... ...
... ... @@ -20,8 +20,6 @@ public interface IGoodsService {
int platformReceiveGoods(long orderCode);
int platformChecking(long orderCode);
/**
* 鉴定通过
* @param appraiseOrder
... ...
... ... @@ -67,18 +67,20 @@ public abstract class AbsGoodsServiceOrderService implements IGoodsService {
return rows;
}
/**
* 质检通过
* @param orderCode
* @return
* 鉴别为假
* @param appraiseOrder
*/
@Override
public int platformChecking(long orderCode){
AppraiseOrderStatus targetStatus = AppraiseOrderStatus.PLATFORM_CHECKING,
public int appraiseFake(AppraiseOrder appraiseOrder){
long orderCode = appraiseOrder.getOrderCode();
AppraiseOrderStatus targetStatus = AppraiseOrderStatus.CHECKING_FAKE,
expectedStatus = AppraiseOrderStatus.PLATFORM_RECEIVE;
int rows = triggerStatusChange(orderCode, targetStatus, expectedStatus);
logger.info("appraise order platformChecking update status, orderCode {} rows {}", orderCode, rows);
logger.info("appraise order appraiseFake update status, orderCode {} rows {}", orderCode, rows);
return rows;
}
... ... @@ -90,7 +92,7 @@ public abstract class AbsGoodsServiceOrderService implements IGoodsService {
public int appraisePass(AppraiseOrder appraiseOrder){
long orderCode = appraiseOrder.getOrderCode();
AppraiseOrderStatus targetStatus = AppraiseOrderStatus.JUDGE_PASS,
expectedStatus = AppraiseOrderStatus.PLATFORM_CHECKING;
expectedStatus = AppraiseOrderStatus.PLATFORM_RECEIVE;
int rows = triggerStatusChange(orderCode, targetStatus, expectedStatus);
logger.info("appraise order appraisePass update status, orderCode {} rows {}", orderCode, rows);
... ... @@ -98,21 +100,6 @@ public abstract class AbsGoodsServiceOrderService implements IGoodsService {
}
/**
* 鉴别为假
* @param appraiseOrder
*/
@Override
public int appraiseFake(AppraiseOrder appraiseOrder){
long orderCode = appraiseOrder.getOrderCode();
AppraiseOrderStatus targetStatus = AppraiseOrderStatus.CHECKING_FAKE,
expectedStatus = AppraiseOrderStatus.PLATFORM_CHECKING;
int rows = triggerStatusChange(orderCode, targetStatus, expectedStatus);
logger.info("appraise order appraiseFake update status, orderCode {} rows {}", orderCode, rows);
return rows;
}
/**
* 无法鉴别
* @param appraiseOrder
*/
... ...
... ... @@ -737,13 +737,10 @@ public class BuyerOrderServiceImpl implements IBuyerOrderService {
// 质检通过,不需要记录物流调拨信息
@Override
@Deprecated
public void qualityCheckPass(long orderCode){
logger.info("in qualityCheckPass, orderCode {}", orderCode);
if(serviceOrderProcessor.isGoodsServiceOrder(orderCode)){
logger.info("in qualityCheckPass order is GoodsServiceOrder orderCode {}", orderCode);
serviceOrderProcessor.findGoodsServiceInstance(orderCode).platformChecking(orderCode);
return;
}
OrderStatus expectStatus = OrderStatus.PLATFORM_RECEIVE;
... ...