合利宝相关

src/main/java/com/caimei365/order/service/impl/HeliPayNonOrderServiceImpl.java

@@ -13,8 +13,6 @@ import com.caimei365.order.model.bo.VipRecordBo;
 import com.caimei365.order.model.dto.HeliDto;
 import com.caimei365.order.model.enums.AccountPayOrderType;
 import com.caimei365.order.model.enums.AppPayType;
-import com.caimei365.order.model.enums.OrderStatus;
-import com.caimei365.order.model.enums.PayType;
 import com.caimei365.order.model.po.DiscernReceiptPo;
 import com.caimei365.order.model.po.OrderReceiptRelationPo;
 import com.caimei365.order.model.po.SplitAccountPo;
@@ -28,8 +26,8 @@ import com.caimei365.order.utils.helipay.Disguiser;
 import com.caimei365.order.utils.helipay.HttpClientService;
 import com.caimei365.order.utils.helipay.MyBeanUtils;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.httpclient.HttpStatus;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.http.HttpStatus;
 import org.springframework.beans.BeanUtils;
 import org.springframework.http.HttpHeaders;
 import org.springframework.stereotype.Service;
@@ -42,7 +40,6 @@ import java.security.NoSuchAlgorithmException;
 import java.security.spec.InvalidKeySpecException;
 import java.text.SimpleDateFormat;
 import java.util.*;
-import java.util.concurrent.atomic.AtomicReference;
 
 import static com.caimei365.order.constant.Constant.SPLIT;
 import static com.caimei365.order.constant.Constant.YL;

src/main/java/com/caimei365/order/utils/MyBeanUtils.java

@@ -1,113 +0,0 @@
-package com.caimei365.order.utils;
-
-
-import com.caimei365.order.constant.Constant;
-import org.apache.commons.beanutils.BeanUtils;
-import org.apache.commons.lang3.StringUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-
-import java.beans.IntrospectionException;
-import java.lang.reflect.Field;
-import java.lang.reflect.InvocationTargetException;
-import java.util.HashSet;
-import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.Set;
-
-/**
- *
- */
-public class MyBeanUtils extends BeanUtils{
-
-    private static final Logger LOGGER = LoggerFactory.getLogger(MyBeanUtils.class);
-
-    private MyBeanUtils(){ }
-
-    public static Map convertBean(Object bean, Map retMap)
-            throws IntrospectionException, IllegalAccessException, InvocationTargetException {
-        Class clazz = bean.getClass();
-        Field[] fields = clazz.getDeclaredFields();
-        for (Field f : fields) {
-            f.setAccessible(true);
-        }
-        for (Field f : fields) {
-            String key = f.toString().substring(f.toString().lastIndexOf(".") + 1);
-            if (StringUtils.equalsIgnoreCase("NEED_SIGN_PARAMS", key)) {
-                continue;
-            }
-            Object value = f.get(bean);
-            if (value == null)
-                value = "";
-            retMap.put(key, value);
-        }
-        return retMap;
-    }
-
-    public static String getSigned(Map<String, String> map, String[] excludes){
-        StringBuffer sb = new StringBuffer();
-        Set<String> excludeSet = new HashSet<String>();
-        excludeSet.add("sign");
-        if(excludes != null){
-            for(String exclude : excludes){
-                excludeSet.add(exclude);
-            }
-        }
-        for(String key : map.keySet()){
-            if(!excludeSet.contains(key)){
-                String value = map.get(key);
-                value = (value == null ? "" : value);
-                sb.append(Constant.SPLIT);
-                sb.append(value);
-            }
-        }
-//        sb.append(Constant.SPLIT);
-        return sb.toString();
-    }
-
-    public static String getSigned(Object bean, String[] excludes) throws IllegalAccessException, IntrospectionException, InvocationTargetException {
-        Map map  = convertBean(bean, new LinkedHashMap());
-        String signedStr = getSigned(map, excludes);
-        return signedStr;
-    }
-
-    /**
-     * new style
-     *
-     * @param bean
-     * @param needSignParams
-     */
-    public static String getSignedByPresetParameter(Object bean, Set<String> needSignParams) throws IllegalAccessException,
-            IntrospectionException, InvocationTargetException {
-        Map map = convertBean(bean, new LinkedHashMap<>());
-        return getSignedByPresetParameter(map, needSignParams);
-    }
-
-    /**
-     * new style
-     *
-     * @param map
-     * @param needSignParams
-     * @return
-     */
-    public static String getSignedByPresetParameter(Map<String, String> map, Set<String> needSignParams) {
-        StringBuffer sb = new StringBuffer();
-        if (needSignParams == null || needSignParams.isEmpty()) {
-            throw new RuntimeException("needSignParams is required");
-        }
-        for (String key : map.keySet()) {
-            if (needSignParams.contains(key)) {
-                // do sign
-                String value = map.get(key);
-                value = (value == null ? "" : value);
-                sb.append(Constant.SPLIT);
-                sb.append(value);
-            }
-        }
-//        改为手动拼接密钥
-//        sb.append(Constant.SPLIT).append(Constant.SAOMA);
-        //LOGGER.info("sign result:{}", sb.toString());
-        return sb.toString();
-    }
-
-}

src/main/java/com/caimei365/order/utils/helipay/MyBeanUtils.java

@@ -2,10 +2,10 @@ package com.caimei365.order.utils.helipay;
 
 
 import com.caimei365.order.constant.Constant;
-import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.lang3.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
 
 import java.beans.IntrospectionException;
 import java.lang.reflect.Field;
@@ -18,7 +18,7 @@ import java.util.Set;
 /**
  *
  */
-public class MyBeanUtils extends BeanUtils{
+public class MyBeanUtils extends BeanUtils {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(MyBeanUtils.class);