Authored by chenchao

Merge branch 'dev_普通卖家变价' into test6.8.9

... ... @@ -170,6 +170,7 @@ public class SellerOrderCancelService {
* @return
*/
public int cancelSellerOrder(int uid, long orderCode){
logger.info("cancelSellerOrder uid {} orderCode {}", uid, orderCode);
int result = 0;
final OrderCodeType codeType = OrderCodeType.SELLER_TYPE;
SellerOrder sellerOrder = null;
... ... @@ -227,6 +228,7 @@ public class SellerOrderCancelService {
}
private int cancelBuyerOrder(int uid, long orderCode){
logger.info("cancelBuyerOrder uid {} orderCode {}", uid, orderCode);
int result = 0;
final OrderCodeType codeType = OrderCodeType.BUYER_TYPE;
SellerOrder sellerOrder = null;
... ...
... ... @@ -287,7 +287,9 @@ public class NotEntrySellerChangePriceService {
private int recordFailIfPresent(int uid, long orderCode, ChangePriceStatus tcps, ChangePriceStatus sourceStatus){
logger.info("record Fail If Present SellerChangePriceRecord,uid {} orderCode {} target status {}",
uid, orderCode, tcps);
if (isChangePriceOrder(orderCode)){
if (!isChangePriceOrder(orderCode)){
logger.warn("record Fail If Present SellerChangePriceRecord find no record,uid {} orderCode {} target status {}",
uid, orderCode, tcps);
return 0;
}
SellerChangePriceRecord scprc = new SellerChangePriceRecord();
... ...