caozj il y a 2 ans
Parent
commit
813c8ee0c9
1 fichiers modifiés avec 41 ajouts et 25 suppressions
  1. 41 25
      hx-purchase/src/main/java/com/fjhx/purchase/flow/PayFlow.java

+ 41 - 25
hx-purchase/src/main/java/com/fjhx/purchase/flow/PayFlow.java

@@ -6,16 +6,27 @@ import com.baomidou.dynamic.datasource.annotation.DS;
 import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
+import com.fjhx.account.entity.account.enums.PaymentStatusEnum;
+import com.fjhx.account.entity.account.enums.PaymentTypeEnum;
+import com.fjhx.account.entity.account.po.AccountPayment;
+import com.fjhx.account.service.account.AccountPaymentService;
 import com.fjhx.common.constant.SourceConstant;
+import com.fjhx.file.utils.ObsFileUtil;
 import com.fjhx.flow.core.FlowDelegate;
+import com.fjhx.purchase.entity.pay.enums.PayStatusEnum;
+import com.fjhx.purchase.entity.pay.po.Pay;
+import com.fjhx.purchase.entity.pay.po.PayDetail;
 import com.fjhx.purchase.entity.purchase.enums.PurchaseDetailStatusEnum;
 import com.fjhx.purchase.entity.purchase.enums.PurchaseStatusEnum;
 import com.fjhx.purchase.entity.purchase.po.Purchase;
 import com.fjhx.purchase.entity.purchase.po.PurchaseDetail;
+import com.fjhx.purchase.service.pay.PayDetailService;
+import com.fjhx.purchase.service.pay.PayService;
 import com.fjhx.purchase.service.purchase.PurchaseDetailService;
 import com.fjhx.purchase.service.purchase.PurchaseService;
 import com.fjhx.purchase.util.code.CodeEnum;
 import com.obs.services.internal.ServiceException;
+import io.seata.spring.annotation.GlobalTransactional;
 import org.springframework.stereotype.Component;
 
 import java.util.Date;
@@ -44,20 +55,20 @@ public class PayFlow extends FlowDelegate {
      */
     @Override
     public Long start(Long flowId, JSONObject submitData) {
-        PurchaseService purchaseService = SpringUtil.getBean(PurchaseService.class);
-        PurchaseDetailService purchaseDetailService = SpringUtil.getBean(PurchaseDetailService.class);
-        Purchase purchase = submitData.toJavaObject(Purchase.class);
-        purchase.setCode(CodeEnum.PURCHASE.getCode());
-        purchase.setPurchaseStatus(PurchaseStatusEnum.UNDER_REVIEW.getKey());
-        purchaseService.save(purchase);
-        List<PurchaseDetail> purchaseDetailList = purchase.getPurchaseDetailList();
-        if(CollectionUtils.isNotEmpty(purchaseDetailList)){
-            for(PurchaseDetail s : purchaseDetailList){
-                s.setPurchaseId(purchase.getId());
+        PayService payService = SpringUtil.getBean(PayService.class);
+        PayDetailService payDetailService = SpringUtil.getBean(PayDetailService.class);
+        Pay pay = submitData.toJavaObject(Pay.class);
+        pay.setStatus(PayStatusEnum.UNDER_REVIEW.getKey());
+        payService.save(pay);
+        List<PayDetail> payDetailList = pay.getPayDetailList();
+        if(CollectionUtils.isNotEmpty(payDetailList)){
+            for(PayDetail s : payDetailList){
+                s.setPayId(pay.getId());
             }
-            purchaseDetailService.saveBatch(purchaseDetailList);
+            payDetailService.saveBatch(payDetailList);
         }
-        return purchase.getId();
+        ObsFileUtil.saveFile(pay.getFileList(),pay.getId());
+        return pay.getId();
     }
 
     /**
@@ -68,21 +79,26 @@ public class PayFlow extends FlowDelegate {
      */
     @Override
     public void end(Long flowId, Long businessId, JSONObject submitData) {
-        PurchaseService purchaseService = SpringUtil.getBean(PurchaseService.class);
-        PurchaseDetailService purchaseDetailService = SpringUtil.getBean(PurchaseDetailService.class);
+        PayService payService = SpringUtil.getBean(PayService.class);
+        AccountPaymentService accountPaymentService = SpringUtil.getBean(AccountPaymentService.class);
         //通过业务ID查询申购数据
-        Purchase purchase = purchaseService.getById(businessId);
-        if(ObjectUtils.isEmpty(purchase)){
-            throw new ServiceException("采购单不存在");
+        Pay pay = payService.getById(businessId);
+        if(ObjectUtils.isEmpty(pay)){
+            throw new ServiceException("采购付款单不存在");
         }
         //修改采购状态为审批通过
-        purchase.setPurchaseStatus(PurchaseStatusEnum.PASS.getKey());
-        purchase.setApprovedDate(new Date());
-        purchaseService.updateById(purchase);
-        //修改采购明细为待采购
-        PurchaseDetail detail = new PurchaseDetail();
-        detail.setStatus(PurchaseDetailStatusEnum.PASS.getKey());
-        purchaseDetailService.update(detail,Wrappers.<PurchaseDetail>query()
-                .lambda().eq(PurchaseDetail::getPurchaseId,purchase.getId()));
+        pay.setStatus(PayStatusEnum.PASS.getKey());
+        pay.setApprovedDate(new Date());
+        payService.updateById(pay);
+        //添加一条付款流水
+        AccountPayment payment = new AccountPayment();
+        payment.setAccountManagementId(pay.getAccountManagementId());
+        payment.setBusinessId(pay.getId());
+        payment.setCurrency(pay.getCurrency());
+        payment.setPaymentRemark(pay.getRemark());
+        payment.setType(PaymentTypeEnum.REJECT.getKey());
+        payment.setStatus(PaymentStatusEnum.UNDER_REVIEW.getKey());
+        payment.setAmount(pay.getAmount());
+        accountPaymentService.save(payment);
     }
 }