Merge remote-tracking branch 'origin/developer' into developer

gic-platform-enterprise-api/src/main/java/com/gic/enterprise/constant/SmsAppEnum.java

 package com.gic.enterprise.constant;
 
-import org.apache.commons.lang3.StringUtils;
-
 /**
  * @author zhiwj
  * @Description: 短信消费应用场景
@@ -46,7 +44,7 @@ public enum SmsAppEnum {
     }
 
     public static String getNameByCode(String code) {
-        if (StringUtils.isNotBlank(code)) {
+        if (code != null) {
             for (SmsAppEnum smsApp : values()) {
                 if (smsApp.code.equals(code)) {
                     return smsApp.name;

gic-platform-enterprise-api/src/main/java/com/gic/enterprise/service/BillingRechargeApiService.java

 package com.gic.enterprise.service;
 
-import com.alibaba.fastjson.JSONObject;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.enterprise.dto.BillingRechargeDTO;
 
+import java.util.HashMap;
+import java.util.Map;
+
 /**
  * 充值
  * @ClassName: BillingRechargeApiService
@@ -22,7 +24,7 @@ public interface BillingRechargeApiService {
      * @return com.gic.api.base.commons.ServiceResponse<java.lang.Integer>
      * @throws 
      */
-    ServiceResponse<JSONObject> saveAndSelectPaymentMethod(BillingRechargeDTO billingRechargeDTO);
+    ServiceResponse<Map<String, Object>> saveAndSelectPaymentMethod(BillingRechargeDTO billingRechargeDTO);
 
     /**
      * 确认支付

gic-platform-enterprise-api/src/main/java/com/gic/enterprise/utils/SignUtils.java

-package com.gic.enterprise.utils;
-
-import com.gic.commons.util.MD5Utils;
-import org.apache.commons.lang3.StringUtils;
-import org.springframework.beans.BeanWrapper;
-import org.springframework.beans.BeanWrapperImpl;
-
-import java.beans.PropertyDescriptor;
-import java.util.Map;
-import java.util.TreeMap;
-
-/**
- *
- * @Description:
- * @author zhiwj
- * @date 2019/8/30 17:42
- */
-public class SignUtils {
-
-    public static String getSign(Object source) {
-        final BeanWrapper src = new BeanWrapperImpl(source);
-        PropertyDescriptor[] pds = src.getPropertyDescriptors();
-        TreeMap<String, Object> propertys = new TreeMap<>();
-        for (PropertyDescriptor pd : pds) {
-            String name = pd.getName();
-            Object propertyValue = src.getPropertyValue(name);
-            if (propertyValue != null && !"sign".equals(name) && !"class".equals(name) && !"payType".equals(name)) {
-                propertys.put(name, propertyValue);
-            }
-        }
-        StringBuilder sb = new StringBuilder();
-        for (Map.Entry<String, Object> entry : propertys.entrySet()) {
-            sb.append(entry.getKey()).append("=").append(entry.getValue()).append("&");
-        }
-        if (sb.length() > 0) {
-            sb.deleteCharAt(sb.length() - 1);
-        }
-
-        return MD5Utils.ToMD5(sb.toString());
-    }
-
-    public static boolean validSign(Object source, String sign) {
-        return StringUtils.equals(SignUtils.getSign(source), sign);
-    }
-
-}

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/BillingRechargeApiServiceImpl.java

@@ -23,6 +23,8 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Map;
+
 /**
  *
  * @ClassName: BillingRechargeApiServiceImpl
@@ -44,7 +46,7 @@ public class BillingRechargeApiServiceImpl implements BillingRechargeApiService
 
     @Override
     @Transactional
-    public ServiceResponse<JSONObject> saveAndSelectPaymentMethod(BillingRechargeDTO billingRechargeDTO) {
+    public ServiceResponse<Map<String, Object>> saveAndSelectPaymentMethod(BillingRechargeDTO billingRechargeDTO) {
         String serialNumber = StringUtils.isNotBlank(billingRechargeDTO.getSerialNumber())?billingRechargeDTO.getSerialNumber(): CreateSerialNumberUtils.createSerialNumber();
         ServiceResponse<BillingPayInfoDTO> serviceResponse = billingPayInfoApiService.savePrePayInfo(billingRechargeDTO.getEnterpriseId(), billingRechargeDTO.getTotalFee(), billingRechargeDTO.getPayType(), BuyTypeEnum.BALANCE_RECHARGE.getCode(), serialNumber);
         if (!serviceResponse.isSuccess()) {

gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/BillingRechargeController.java

 package com.gic.enterprise.web.controller;
 
-import com.alibaba.fastjson.JSONObject;
 import com.gic.api.base.commons.Page;
 import com.gic.api.base.commons.ServiceResponse;
 import com.gic.commons.util.EntityUtil;
@@ -27,6 +26,8 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.util.Map;
+
 /**
  *
  * @Description:
@@ -54,7 +55,7 @@ public class BillingRechargeController {
         billingRechargeDTO.setInitiator(BillingInitiatorTypeEnum.ENTERPRISE.getCode());
         billingRechargeDTO.setInitiatorUser(userDetail.getUserId());
         billingRechargeDTO.setInitiatorName(userDetail.getUserInfo().getUserName());
-        ServiceResponse<JSONObject> serviceResponse = billingRechargeApiService.saveAndSelectPaymentMethod(billingRechargeDTO);
+        ServiceResponse<Map<String, Object>> serviceResponse = billingRechargeApiService.saveAndSelectPaymentMethod(billingRechargeDTO);
         if (serviceResponse.isSuccess()) {
             LogUtils.createLog("预支付金额：" + billingRechargeQO.getTotalFee(), PayTypeEnum.getMessageByCode(billingRechargeQO.getPayType()));
         }