Merge branch 'developer' into 'master'

Developer

See merge request !3

gic-platform-finance-service/pom.xml

@@ -123,6 +123,17 @@
             <artifactId>gic-open-platform-api</artifactId>
             <version>${gic-open-platform-api}</version>
         </dependency>
+        <dependency>
+            <groupId>com.gic</groupId>
+            <artifactId>gic-marketing-process-api</artifactId>
+            <version>${gic-marketing-process-api}</version>
+        </dependency>
+        <!--开放平台-->
+        <dependency>
+            <groupId>com.gic</groupId>
+            <artifactId>gic-open-platform-api</artifactId>
+            <version>${gic-open-platform-api}</version>
+        </dependency>
     </dependencies>
 
     <build>

gic-platform-finance-service/src/main/java/com/gic/finance/service/outer/impl/InvoiceManageApiServiceImpl.java

@@ -2,6 +2,9 @@ package com.gic.finance.service.outer.impl;
 
 import java.util.Date;
 
+import com.gic.auth.dto.UserDTO;
+import com.gic.auth.service.UserApiService;
+import com.gic.marketing.process.api.service.sms.SmsSendApiService;
 import org.apache.commons.lang.StringUtils;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
@@ -35,6 +38,10 @@ public class InvoiceManageApiServiceImpl implements InvoiceManageApiService {
     private InvoiceManageService invoiceManageService;
     @Autowired
     private InvoiceAccountService invoiceAccountService;
+    @Autowired
+    private SmsSendApiService smsSendApiService;
+    @Autowired
+    private UserApiService userApiService;
 
     public ServiceResponse<String> applyInvoiceInit(InvoiceManageDTO invoiceManageDTO) {
         ServiceResponse paramResponse = ValidParamsUtils.allCheckValidate(invoiceManageDTO,
@@ -119,6 +126,8 @@ public class InvoiceManageApiServiceImpl implements InvoiceManageApiService {
             AsyncCallbackUtils.callBack(callbackDTO, "com.gic.open.api.service.market.InvoiceCallbackApiService",
                     "invoiceCallback");
         }
+
+        sendSms(tabInvoiceManage, "GICJFZX010");
         return ServiceResponse.success();
     }
 
@@ -147,6 +156,8 @@ public class InvoiceManageApiServiceImpl implements InvoiceManageApiService {
             AsyncCallbackUtils.callBack(callbackDTO, "com.gic.open.api.service.market.InvoiceCallbackApiService",
                     "invoiceCallback");
         }
+
+        sendSms(tabInvoiceManage, "GICJFZX011");
         return ServiceResponse.success();
     }
 
@@ -204,4 +215,36 @@ public class InvoiceManageApiServiceImpl implements InvoiceManageApiService {
         dto.setOperatorPhone(userInfo.getUserMobile());
         dto.setOperatorTime(new Date());
     }
+
+    private void sendSms(TabInvoiceManage tabInvoiceManage, String smsSceneId) {
+        if (StringUtils.isNotBlank(tabInvoiceManage.getExpressMailName())) {
+            //如果是计费中心，则发起人数据 就是用户ID
+            if (StringUtils.isNotBlank(tabInvoiceManage.getInitiator())) {
+                Integer userId = Integer.parseInt(tabInvoiceManage.getInitiator());
+                ServiceResponse<UserDTO> userResponse = userApiService.getUserById(userId);
+                if (!userResponse.isSuccess()) {
+                    LOGGER.warn("发票审批完成发送短信:{},{}", userResponse.getCode(), userResponse.getMessage());
+                }
+                UserDTO userDTO = userResponse.getResult();
+
+                String[] smsArr = null;
+                if ("GICJFZX010".equals(smsSceneId)) {
+                    smsArr=  new String[]{tabInvoiceManage.getEnterpriseName(),
+                            tabInvoiceManage.getInvoiceApplySerial(),
+                            tabInvoiceManage.getExpressMailName(),
+                            tabInvoiceManage.getExpressMailNumber()};
+                } else if ("GICJFZX011".equals(smsSceneId)) {
+                    smsArr = new String[]{tabInvoiceManage.getEnterpriseName(),
+                            tabInvoiceManage.getInvoiceApplySerial(), tabInvoiceManage.getRejectReason()};
+                }
+
+                ServiceResponse<Void> smsSendResult = smsSendApiService.sendPlatformSms(smsSceneId,
+                        tabInvoiceManage.getEnterpriseId(),
+                        userDTO.getPhoneAreaCode(), userDTO.getPhoneNumber(), smsArr);
+                if (!smsSendResult.isSuccess()) {
+                    LOGGER.warn(smsSendResult.getMessage());
+                }
+            }
+        }
+    }
 }

gic-platform-finance-service/src/main/java/com/gic/finance/service/outer/impl/TransferAccountsApprovalApiServiceImpl.java

@@ -3,6 +3,13 @@ package com.gic.finance.service.outer.impl;
 import java.util.Date;
 import java.util.List;
 
+import com.gic.auth.dto.UserDTO;
+import com.gic.auth.service.UserApiService;
+import com.gic.marketing.process.api.service.sms.SmsSendApiService;
+import com.gic.open.api.dto.ApplicationDTO;
+import com.gic.open.api.dto.OrderDTO;
+import com.gic.open.api.service.ApplicationApiService;
+import com.gic.open.api.service.OrderApiService;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -40,6 +47,14 @@ public class TransferAccountsApprovalApiServiceImpl implements TransferAccountsA
     private final static String SERVICE_NAME = "转账审批";
     @Autowired
     private TransferAccountsApprovalService transferAccountsApprovalService;
+    @Autowired
+    private OrderApiService orderApiService;
+    @Autowired
+    private ApplicationApiService applicationApiService;
+    @Autowired
+    private SmsSendApiService smsSendApiService;
+    @Autowired
+    private UserApiService userApiService;
 
     /**
      * 发起审批
@@ -156,6 +171,55 @@ public class TransferAccountsApprovalApiServiceImpl implements TransferAccountsA
 
         callBack(tab);
         transferAccountsApprovalService.updateTransferAccountsApproval(dto);
+
+        //如果是商户基础服务，则进行短信发送给超级管理员
+        if (tab.getOrderType().intValue() == OrderTypeEnum.SERVICE.getCode()) {
+            //服务类型
+            String orderNum = tab.getOrderNumber();
+            ServiceResponse<OrderDTO> orderResult = orderApiService.getOrderForFinance(orderNum);
+            if (!orderResult.isSuccess()) {
+                LOGGER.warn("财务审批通过-服务订单信息结果:{}, {}", orderResult.getCode(), orderResult.getMessage());
+            }
+            OrderDTO orderDTO = orderResult.getResult();
+            Long applicationId = orderDTO.getApplicationId();
+            ServiceResponse<ApplicationDTO> applicationResult = applicationApiService.getApplicationSimpleByApplicationId(applicationId);
+            if (!applicationResult.isSuccess()) {
+                LOGGER.warn("财务审批通过-应用信息结果:{}, {}", applicationResult.getCode(), applicationResult.getMessage());
+            }
+            if ("gic".equals(applicationResult.getResult().getModuleCode())) {
+                //是基础服务
+                ServiceResponse<UserDTO> userResult = userApiService.getUserByEnterpriseId(tab.getEnterpriseId());
+                UserDTO userDTO = userResult.getResult();
+                Integer relationOrderType = orderDTO.getOrderType();
+                String operationName = "开通";
+                switch (relationOrderType) {
+                    case 1:
+                        operationName = "开通";
+                        break;
+                    case 2:
+                        operationName = "续费";
+                        break;
+                    case 3:
+                        operationName = "升级";
+                        break;
+                    case 4:
+                        operationName = "扩容";
+                        break;
+                    default:
+                }
+                String[] smsArr = new String[]{tab.getEnterpriseName(), operationName};
+                if (userResult.isSuccess()) {
+                    ServiceResponse<Void> smsSendResult = smsSendApiService.sendPlatformSms("GICJFZX004",
+                            tab.getEnterpriseId(),
+                            userDTO.getPhoneAreaCode(), userDTO.getPhoneNumber(), smsArr);
+                    if (!smsSendResult.isSuccess()) {
+                        LOGGER.warn(smsSendResult.getMessage());
+                    }
+                }
+            } else {
+                LOGGER.warn("财务审批通过-不是基础服务");
+            }
+        }
         return ServiceResponse.success();
     }
 

gic-platform-finance-service/src/main/resources/dubbo-gic-platform-finance-service.xml

@@ -26,4 +26,12 @@
     <!--提现管理-->
     <dubbo:service interface="com.gic.finance.service.CashWithdrawalApiService" ref="cashWithdrawalApiService" timeout="6000" />
 
+
+    <!--短信发送-->
+    <dubbo:reference interface="com.gic.marketing.process.api.service.sms.SmsSendApiService" id="smsSendApiService" timeout="60000" />
+    <!--用户-->
+    <dubbo:reference interface="com.gic.auth.service.UserApiService" id="userApiService" timeout="60000" />
+    <!--开放给平台订单详情-->
+    <dubbo:reference interface="com.gic.open.api.service.OrderApiService" id="orderApiService" timeout="60000" />
+    <dubbo:reference interface="com.gic.open.api.service.ApplicationApiService" id="applicationApiService" timeout="60000" />
 </beans>

gic-platform-finance-web/src/main/java/com/gic/finance/web/controller/InvoiceManageController.java

@@ -134,23 +134,24 @@ public class InvoiceManageController {
         if (invoiceResult.isSuccess()) {
             InvoiceManageDTO invoice = invoiceResult.getResult();
             InvoiceManagerDetailVO vo = EntityUtil.changeEntityNew(InvoiceManagerDetailVO.class, invoice);
-            ServiceResponse<InvoiceAccountDTO> accountResult;
-            if (invoice.getInvoicerId() != null) {
-                accountResult = invoiceAccountApiService.getById(invoice.getInvoicerId());
-            } else {
-                accountResult = invoiceAccountApiService.getEnable();
-            }
-            if (accountResult.isSuccess()) {
-                InvoiceAccountDTO account = accountResult.getResult();
-                vo.setAccountName(account.getAccountName());
-                vo.setAccountPhone(account.getAccountPhone());
-                vo.setAddress(account.getAddress());
-                vo.setBank(account.getBank());
-                vo.setBankAccount(account.getBankAccount());
-                vo.setTaxNumberOfInvoice(account.getTaxNumber());
-            } else {
-                return EnterpriseRestResponse.failure(accountResult);
-            }
+            //不再去去开票户数据，而是gic后台填写的数据
+//            ServiceResponse<InvoiceAccountDTO> accountResult;
+//            if (invoice.getInvoicerId() != null) {
+//                accountResult = invoiceAccountApiService.getById(invoice.getInvoicerId());
+//            } else {
+//                accountResult = invoiceAccountApiService.getEnable();
+//            }
+//            if (accountResult.isSuccess()) {
+//                InvoiceAccountDTO account = accountResult.getResult();
+//                vo.setAccountName(account.getAccountName());
+//                vo.setAccountPhone(account.getAccountPhone());
+//                vo.setAddress(account.getAddress());
+//                vo.setBank(account.getBank());
+//                vo.setBankAccount(account.getBankAccount());
+//                vo.setTaxNumberOfInvoice(account.getTaxNumber());
+//            } else {
+//                return EnterpriseRestResponse.failure(accountResult);
+//            }
             return RestResponse.success(vo);
         } else {
             return EnterpriseRestResponse.failure(invoiceResult);