From eb67a967f8b11cdde6b18e274405c2b02332129f Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期三, 28 四月 2021 12:07:33 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/xinghong-dev'
---
service-store/src/main/java/com/java110/store/bmo/purchase/impl/PurchaseApplyBMOImpl.java | 11 +++--------
1 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/service-store/src/main/java/com/java110/store/bmo/purchase/impl/PurchaseApplyBMOImpl.java b/service-store/src/main/java/com/java110/store/bmo/purchase/impl/PurchaseApplyBMOImpl.java
index 5de4463..7ea76fd 100755
--- a/service-store/src/main/java/com/java110/store/bmo/purchase/impl/PurchaseApplyBMOImpl.java
+++ b/service-store/src/main/java/com/java110/store/bmo/purchase/impl/PurchaseApplyBMOImpl.java
@@ -12,32 +12,27 @@
import org.springframework.http.ResponseEntity;
import org.springframework.stereotype.Service;
-
@Service("purchaseApplyBMOImpl")
public class PurchaseApplyBMOImpl implements IPurchaseApplyBMO {
@Autowired
private IPurchaseApplyInnerServiceSMO purchaseApplyInnerServiceSMOImpl;
-
@Autowired
private IPurchaseApplyUserInnerServiceSMO purchaseApplyUserInnerServiceSMOImpl;
-
@Override
@Java110Transactional
public ResponseEntity<String> apply(PurchaseApplyPo purchaseApplyPo) {
-
int saveFlag = purchaseApplyInnerServiceSMOImpl.savePurchaseApply(purchaseApplyPo);
-
if (saveFlag < 1) {
return ResultVo.createResponseEntity(ResultVo.CODE_ERROR, "閲囪喘鐢宠澶辫触");
}
-
PurchaseApplyDto purchaseApplyDto = BeanConvertUtil.covertBean(purchaseApplyPo, PurchaseApplyDto.class);
purchaseApplyDto.setCurrentUserId(purchaseApplyPo.getUserId());
- purchaseApplyUserInnerServiceSMOImpl.startProcess(purchaseApplyDto);
-
+ if(!purchaseApplyPo.getWarehousingWay().equals(PurchaseApplyDto.WAREHOUSING_TYPE_DIRECT)){
+ purchaseApplyUserInnerServiceSMOImpl.startProcess(purchaseApplyDto);
+ }
return ResultVo.createResponseEntity(ResultVo.CODE_OK, "閲囪喘鐢宠鎴愬姛");
}
}
--
Gitblit v1.8.0