ufo / yohoufo-fore · Commits

Go to a project

Authored by chenchao
Commit 1fdbc5b91cc792476296d208eaf5ea2cd3fcf9e3 1 parent 76eae192

fix bug

Inline Side-by-side
Showing 2 changed files with 15 additions and 4 deletions
@@ -909,7 +909,7 @@ public class SellerOrderCancelService { @@ -909,7 +909,7 @@ public class SellerOrderCancelService {
909 AuditFailedEvent afe = (AuditFailedEvent)auditCancelCase.getEvent(); 909 AuditFailedEvent afe = (AuditFailedEvent)auditCancelCase.getEvent();
910 910
911 final int skup = afe.getSkup(); 911 final int skup = afe.getSkup();
912 - logger.info("in cancel offShelveCancelCase {}", afe); 912 + logger.info("in cancel AuditCancelCase {}", afe);
913 SkupStatus expectSkupStatus = SkupStatus.CAN_SELL; 913 SkupStatus expectSkupStatus = SkupStatus.CAN_SELL;
914 final SellerOrderStatus targetSellerOrderStatus = SellerOrderStatus.AUDIT_FAIL; 914 final SellerOrderStatus targetSellerOrderStatus = SellerOrderStatus.AUDIT_FAIL;
915 CancelStatusNode csn = new CancelStatusNode(); 915 CancelStatusNode csn = new CancelStatusNode();
@@ -291,14 +291,25 @@ public class ProductProxyService extends AbsProxyService{ @@ -291,14 +291,25 @@ public class ProductProxyService extends AbsProxyService{
291 skupReq.setPrice(goods.getGoodsPrice()); 291 skupReq.setPrice(goods.getGoodsPrice());
292 skupReq.setSellerUid(goods.getUid()); 292 skupReq.setSellerUid(goods.getUid());
293 Integer skupa = goods.getAttributes(); 293 Integer skupa = goods.getAttributes();
294 - if (Objects.nonNull(skupa) && SkupType.ADVANCE.getCode() == skupa){  
295 - skupReq.setPreSaleFlag(isAdvace);  
296 - } 294 + Integer presaleFlag = buildPresaleFlag(skupa);
  295 + skupReq.setPreSaleFlag(presaleFlag);
297 ApiResponse resp = ufoServiceCaller.call(syncSkup, skupReq); 296 ApiResponse resp = ufoServiceCaller.call(syncSkup, skupReq);
298 return (null == resp || null == resp.getData())? false : (boolean)resp.getData(); 297 return (null == resp || null == resp.getData())? false : (boolean)resp.getData();
299 } 298 }
300 299
  300 + public static Integer buildPresaleFlag(Integer skupa){
  301 + Integer presaleFlag = null;
  302 + if(Objects.nonNull(skupa)) {
  303 + if (SkupType.ADVANCE.getCode() == skupa) {
  304 + presaleFlag = isAdvace;
  305 + }
  306 + if (SkupType.FLAW.getCode() == skupa || SkupType.SECOND_HAND.getCode() == skupa) {
  307 + presaleFlag = skupa;
  308 + }
301 309
  310 + }
  311 + return presaleFlag;
  312 + }
302 313
303 public boolean batchCreateSkup(List<SellerOrderGoods> sogList){ 314 public boolean batchCreateSkup(List<SellerOrderGoods> sogList){
304 List<StoragePriceBo> skupBoList = new ArrayList<>(sogList.size()); 315 List<StoragePriceBo> skupBoList = new ArrayList<>(sogList.size());