Merge remote-tracking branch 'origin/master'

src/main/java/com/jqtx/windows/common/mq/CreditResultListener.java

@@ -28,6 +28,7 @@ public class CreditResultListener extends AbstractMQConsumerHandler<CreditResult
 
     @Autowired
     private AbcHttpClient abcHttpClient;
+
     @Override
     public Class getClazz() {
         return CreditResultModel.class;
@@ -36,27 +37,29 @@ public class CreditResultListener extends AbstractMQConsumerHandler<CreditResult
     @Override
     public void run(CreditResultModel creditResultModel) throws Exception {
         CreditModel creditModel = creditComponent.getByOrderNo(creditResultModel.getOrderNo());
-        if(ObjectUtil.isNull(creditModel) || !CreditResultStatusEnum.INIT.name().equals(creditModel.getCreditResult())){
+        if (ObjectUtil.isNull(creditModel) || !CreditResultStatusEnum.INIT.name().equals(creditModel.getCreditResult())) {
             return;
         }
         CreditModel update = new CreditModel();
         CreditDetailResponse creditDetailResponse = new CreditDetailResponse();
-        if ("YES".equalsIgnoreCase(creditResultModel.getCreditStatus())) {
+        if ("YES" .equalsIgnoreCase(creditResultModel.getCreditStatus())) {
             update.setCreditResult(CreditResultStatusEnum.PASS.getCode());
+            update.setCreditAmt(creditResultModel.getCreditAmt().toEngineeringString());
             //通过
             creditDetailResponse.setStatus("1");
             creditDetailResponse.setApprovalAmount(creditResultModel.getCreditAmt().toEngineeringString());
         }
-        if ("RETRIAL".equalsIgnoreCase(creditResultModel.getCreditStatus())) {
+        if ("RETRIAL" .equalsIgnoreCase(creditResultModel.getCreditStatus())) {
             update.setCreditResult(CreditResultStatusEnum.INIT.getCode());
         }
-        if ("REJECT".equalsIgnoreCase(creditResultModel.getCreditStatus())) {
+        if ("REJECT" .equalsIgnoreCase(creditResultModel.getCreditStatus())) {
             update.setCreditResult(CreditResultStatusEnum.REFUSED.getCode());
             creditDetailResponse.setStatus("2");
         }
-        creditComponent.updateByOrderNo(creditModel.getOrderNo(),update);
+        creditComponent.updateByOrderNo(creditModel.getOrderNo(), update);
         creditDetailResponse.setRemark(creditResultModel.getMemo());
         creditDetailResponse.setTransNo(IdUtil.fastSimpleUUID());
+        creditDetailResponse.setOrderNo(creditModel.getOrderNo());
         abcHttpClient.postRequest(JSON.toJSONString(creditDetailResponse), ZNPostUrlEnum.CREDIT_CALL.getCode());
     }
 }