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

rs-universal/rs-universal-api/src/main/java/com/upyuns/platform/rs/universal/weixin/api/WXPay.java

@@ -311,13 +311,13 @@ public class WXPay {
 		prePay.setBody(body);
 		prePay.setPartnerKey(SystemConfig.WINXIN_PARTNER_KEY);//pay.getPartnerKey()
 		prePay.setMch_id(SystemConfig.WINXIN_PARTNER);//pay.getPartnerId()
-		prePay.setNotify_url("https://"+SystemConfig.weixinHost+"/icircle/activity/notice.do");
+		prePay.setNotify_url(notify_url);
 		prePay.setOut_trade_no(orderNo);
 		prePay.setSpbill_create_ip(spbill_create_ip);//"123.12.12.123"
 		prePay.setTotal_fee(amount);
-		prePay.setTrade_type("MWEB");
+		prePay.setTrade_type("NATIVE");
 		log.error("getH5PayParam->payOrderDto:{},appId:{},mchId:{},partnerKey:{},subMchId:{}",
-				prePay.getAppid(), prePay.getMch_id(), prePay, SystemConfig.WINXIN_AppID);
+				prePay, prePay.getAppid(), prePay.getMch_id(), prePay.getPartnerKey(), SystemConfig.WINXIN_PARTNER);
 			
 			String xmlStr = prePay.getPackage();
 		    log.error("xmlStr====="+xmlStr);

rs-website/rs-website-server/src/main/java/com/upyuns/platform/rs/website/biz/OrderInfoBiz.java

@@ -35,6 +35,7 @@ import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.concurrent.atomic.AtomicReference;
 import java.util.stream.Collectors;
 
@@ -934,6 +935,7 @@ public class OrderInfoBiz extends BaseBiz<OrderInfoMapper, OrderInfo> {
 					});
 				}
 		}
+		itemInfoVoList.removeIf(Objects::isNull);
 		return ObjectRestResponse.succ(itemInfoVoList);
 	}