1111import java .util .HashMap ;
1212import java .util .List ;
1313import java .util .Map ;
14+ import java .util .Map .Entry ;
1415import java .util .SortedMap ;
1516import java .util .TreeMap ;
1617import java .util .UUID ;
@@ -634,8 +635,9 @@ public List<WxMpUserSummary> getUserSummary(Date beginDate, Date endDate) throws
634635 param .addProperty ("end_date" , SIMPLE_DATE_FORMAT .format (endDate ));
635636 String responseContent = post (url , param .toString ());
636637 JsonElement tmpJsonElement = Streams .parse (new JsonReader (new StringReader (responseContent )));
637- return WxMpGsonBuilder .INSTANCE .create ().fromJson (tmpJsonElement .getAsJsonObject ().get ("list" ), new TypeToken <List <WxMpUserSummary >>() {
638- }.getType ());
638+ return WxMpGsonBuilder .INSTANCE .create ().fromJson (tmpJsonElement .getAsJsonObject ().get ("list" ),
639+ new TypeToken <List <WxMpUserSummary >>() {
640+ }.getType ());
639641 }
640642
641643 @ Override
@@ -695,7 +697,7 @@ public <T, E> T execute(RequestExecutor<T, E> executor, String uri, E data) thro
695697 throw new RuntimeException ("微信服务端异常,超出重试次数" );
696698 }
697699
698- protected <T , E > T executeInternal (RequestExecutor <T , E > executor , String uri , E data ) throws WxErrorException {
700+ protected synchronized <T , E > T executeInternal (RequestExecutor <T , E > executor , String uri , E data ) throws WxErrorException {
699701 if (uri .indexOf ("access_token=" ) != -1 ) {
700702 throw new IllegalArgumentException ("uri参数中不允许有access_token: " + uri );
701703 }
@@ -776,43 +778,45 @@ public void setMaxRetryTimes(int maxRetryTimes) {
776778
777779 @ Override
778780 public WxMpPrepayIdResult getPrepayId (String openId , String outTradeNo , double amt , String body , String tradeType , String ip , String callbackUrl ) {
779- String nonce_str = System .currentTimeMillis () + "" ;
780-
781- SortedMap <String , String > packageParams = new TreeMap <String , String >();
781+ Map <String , String > packageParams = new HashMap <String , String >();
782782 packageParams .put ("appid" , wxMpConfigStorage .getAppId ());
783783 packageParams .put ("mch_id" , wxMpConfigStorage .getPartnerId ());
784- packageParams .put ("nonce_str" , nonce_str );
785784 packageParams .put ("body" , body );
786785 packageParams .put ("out_trade_no" , outTradeNo );
787-
788786 packageParams .put ("total_fee" , (int ) (amt * 100 ) + "" );
789787 packageParams .put ("spbill_create_ip" , ip );
790788 packageParams .put ("notify_url" , callbackUrl );
791789 packageParams .put ("trade_type" , tradeType );
792790 packageParams .put ("openid" , openId );
793791
792+ return getPrepayId (packageParams );
793+ }
794+
795+ public WxMpPrepayIdResult getPrepayId (final Map <String , String > parameters ) {
796+ String nonce_str = System .currentTimeMillis () + "" ;
797+
798+ final SortedMap <String , String > packageParams = new TreeMap <String , String >(parameters );
799+ packageParams .put ("appid" , wxMpConfigStorage .getAppId ());
800+ packageParams .put ("mch_id" , wxMpConfigStorage .getPartnerId ());
801+ packageParams .put ("nonce_str" , nonce_str );
802+ checkParameters (packageParams );
803+
794804 String sign = WxCryptUtil .createSign (packageParams , wxMpConfigStorage .getPartnerKey ());
795- String xml = "<xml>" +
796- "<appid>" + wxMpConfigStorage .getAppId () + "</appid>" +
797- "<mch_id>" + wxMpConfigStorage .getPartnerId () + "</mch_id>" +
798- "<nonce_str>" + nonce_str + "</nonce_str>" +
799- "<sign>" + sign + "</sign>" +
800- "<body><![CDATA[" + body + "]]></body>" +
801- "<out_trade_no>" + outTradeNo + "</out_trade_no>" +
802- "<total_fee>" + packageParams .get ("total_fee" ) + "</total_fee>" +
803- "<spbill_create_ip>" + ip + "</spbill_create_ip>" +
804- "<notify_url>" + callbackUrl + "</notify_url>" +
805- "<trade_type>" + tradeType + "</trade_type>" +
806- "<openid>" + openId + "</openid>" +
807- "</xml>" ;
805+ packageParams .put ("sign" , sign );
806+
807+ StringBuilder request = new StringBuilder ("<xml>" );
808+ for (Entry <String , String > para : packageParams .entrySet ()) {
809+ request .append (String .format ("<%s>%s</%s>" , para .getKey (), para .getValue (), para .getKey ()));
810+ }
811+ request .append ("</xml>" );
808812
809813 HttpPost httpPost = new HttpPost ("https://api.mch.weixin.qq.com/pay/unifiedorder" );
810814 if (httpProxy != null ) {
811815 RequestConfig config = RequestConfig .custom ().setProxy (httpProxy ).build ();
812816 httpPost .setConfig (config );
813817 }
814818
815- StringEntity entity = new StringEntity (xml , Consts .UTF_8 );
819+ StringEntity entity = new StringEntity (request . toString () , Consts .UTF_8 );
816820 httpPost .setEntity (entity );
817821 try {
818822 CloseableHttpResponse response = getHttpclient ().execute (httpPost );
@@ -827,9 +831,39 @@ public WxMpPrepayIdResult getPrepayId(String openId, String outTradeNo, double a
827831 return new WxMpPrepayIdResult ();
828832 }
829833
834+ final String [] REQUIRED_ORDER_PARAMETERS = new String [] { "appid" , "mch_id" , "body" , "out_trade_no" , "total_fee" , "spbill_create_ip" , "notify_url" ,
835+ "trade_type" , };
836+
837+ private void checkParameters (Map <String , String > parameters ) {
838+ for (String para : REQUIRED_ORDER_PARAMETERS ) {
839+ if (!parameters .containsKey (para ))
840+ throw new IllegalArgumentException ("Reqiured argument '" + para + "' is missing." );
841+ }
842+ if ("JSAPI" .equals (parameters .get ("trade_type" )) && !parameters .containsKey ("openid" ))
843+ throw new IllegalArgumentException ("Reqiured argument 'openid' is missing when trade_type is 'JSAPI'." );
844+ if ("NATIVE" .equals (parameters .get ("trade_type" )) && !parameters .containsKey ("product_id" ))
845+ throw new IllegalArgumentException ("Reqiured argument 'product_id' is missing when trade_type is 'NATIVE'." );
846+ }
847+
830848 @ Override
831849 public Map <String , String > getJSSDKPayInfo (String openId , String outTradeNo , double amt , String body , String tradeType , String ip , String callbackUrl ) {
832- WxMpPrepayIdResult wxMpPrepayIdResult = getPrepayId (openId , outTradeNo , amt , body , tradeType , ip , callbackUrl );
850+ Map <String , String > packageParams = new HashMap <String , String >();
851+ packageParams .put ("appid" , wxMpConfigStorage .getAppId ());
852+ packageParams .put ("mch_id" , wxMpConfigStorage .getPartnerId ());
853+ packageParams .put ("body" , body );
854+ packageParams .put ("out_trade_no" , outTradeNo );
855+ packageParams .put ("total_fee" , (int ) (amt * 100 ) + "" );
856+ packageParams .put ("spbill_create_ip" , ip );
857+ packageParams .put ("notify_url" , callbackUrl );
858+ packageParams .put ("trade_type" , tradeType );
859+ packageParams .put ("openid" , openId );
860+
861+ return getJSSDKPayInfo (packageParams );
862+ }
863+
864+ @ Override
865+ public Map <String , String > getJSSDKPayInfo (Map <String , String > parameters ) {
866+ WxMpPrepayIdResult wxMpPrepayIdResult = getPrepayId (parameters );
833867 String prepayId = wxMpPrepayIdResult .getPrepay_id ();
834868 if (prepayId == null || prepayId .equals ("" )) {
835869 throw new RuntimeException ("get prepayid error" );
0 commit comments