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

pay/src/main/java/com/caimei/module/pay/service/impl/PayServiceImpl.java

@@ -256,7 +256,6 @@ public class PayServiceImpl implements PayService {
      * 设置第三方支付参数
      */
     private JSONObject getPayParameter(Payment payment, HttpServletRequest request, long time) throws Exception {
-        String userType = "ENTERPRISE";
         //用户IP地址
         String userIp = IPUtil.getIpAddr(request);
         JSONObject json = new JSONObject();
@@ -270,11 +269,13 @@ public class PayServiceImpl implements PayService {
         json.put("userIp", userIp);
         json.put("returnUrl", payment.getReturnUrl());
         json.put("notifyUrl", payment.getNotifyUrl());
-        if (null != payment.getBankCode()) {
+        if (StringUtils.isNotBlank(payment.getBankCode())) {
             json.put("bankCode", payment.getBankCode());
         }
-        json.put("userType", userType);
-        if (null != payment.getOrderId()) {
+        if (StringUtils.isNotBlank(payment.getUserType())) {
+            json.put("userType", payment.getUserType());
+        }
+        if (StringUtils.isNotBlank(payment.getOpenid())) {
             json.put("openId", payment.getOpenid());
         }
         return json;

pay/src/main/resources/com-caimei-module-pay/PayMapper.xml

@@ -474,6 +474,7 @@
         FROM
         cm_receipt_order_relation cror
         LEFT JOIN cm_discern_receipt cdr ON cror.receiptID = cdr.id
+        LEFT JOIN cm_order co ON cror.orderID = co.orderID
         WHERE
         cror.relationType = 2
         AND cdr.payWay = 1
@@ -481,6 +482,8 @@
         AND cror.mbOrderId IS NOT NULL
         AND cror.splitStatus = 0
         AND cdr.receiptDate <![CDATA[  <=  ]]> #{currentTime}
+        AND co.organizeID = 0
+        AND co.orderType != 2
     </select>
 
     <select id="findByMbOrderId" resultType="com.caimei.module.base.entity.vo.SplitAccountVo">