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

pom.xml

@@ -194,6 +194,12 @@
 			<artifactId>hmpay-sdk</artifactId>
 			<version>1.1.4</version>
 		</dependency>
+		<!--汇付支付-->
+		<dependency>
+			<groupId>com.huifu.bspay.sdk</groupId>
+			<artifactId>dg-java-sdk</artifactId>
+			<version>3.0.8</version>
+		</dependency>
 		<!--rabbitmq-->
 		<dependency>
 			<groupId>org.springframework.boot</groupId>

src/main/java/com/szwl/controller/TOrderController.java

@@ -420,6 +420,7 @@ public class TOrderController {
         order.setAltInfo(altInfo.toString());
         order.setStatus(0);
         order.setType(type);
+        order.setCompanyType(admin.getCompanyType());
         if(type==0){
             order.setAdminProportion(adminProportion);
             order.setAgencyProportion(agencyProportion);
@@ -805,6 +806,7 @@ public class TOrderController {
         order.setAltInfo(altInfo.toString());
         order.setStatus(0);
         order.setType(type);
+        order.setCompanyType(admin.getCompanyType());
         if(type==0){
             order.setAdminProportion(adminProportion);
             order.setAgencyProportion(agencyProportion);
@@ -1195,6 +1197,7 @@ public class TOrderController {
         order.setAltInfo(altInfo.toString());
         order.setStatus(0);
         order.setType(type);
+        order.setCompanyType(admin.getCompanyType());
         if(type==0){
             order.setAdminProportion(adminProportion);
             order.setAgencyProportion(agencyProportion);
@@ -1237,6 +1240,7 @@ public class TOrderController {
         order2.setAltInfo(altInfo.toString());
         order2.setStatus(0);
         order2.setPayPlatform(payPlatform);
+        order2.setCompanyType(admin.getCompanyType());
         if(StringUtils.isNotEmpty(payPlatform)&&payPlatform.equals("1")){
             order2.setIsSettlement("0");
         }
@@ -1704,6 +1708,7 @@ public class TOrderController {
         order.setStatus(0);
         order.setType(type);
         order.setProductNumber(productNumber);
+        order.setCompanyType(admin.getCompanyType());
         if(type==0){
             order.setAdminProportion(adminProportion);
             order.setAgencyProportion(agencyProportion);
@@ -1748,6 +1753,7 @@ public class TOrderController {
         order2.setStatus(0);
         order2.setType(type);
         order2.setProductNumber(productNumber);
+        order2.setCompanyType(admin.getCompanyType());
         if(type==0){
             order2.setAdminProportion(adminProportion);
             order2.setAgencyProportion(agencyProportion);
@@ -2311,6 +2317,7 @@ public class TOrderController {
         order.setType(type);
         order.setMarketingAmount(marketingAmount);
         order.setProductNumber(productNumber);
+        order.setCompanyType(admin.getCompanyType());
         if(couponList.size()>0){
             order.setCoupons(couponList.toString());
         }
@@ -3469,5 +3476,7 @@ public class TOrderController {
         }
         return altInfo.toString();
     }
+
+
 }
 

src/main/java/com/szwl/mapper/xml/TAdminMapper.xml

@@ -33,11 +33,16 @@
         <result column="code" property="code" />
         <result column="pay_platform" property="payPlatform" />
         <result column="relation_admin_id" property="relationAdminId" />
+        <result column="company_type" property="companyType" />
     </resultMap>
 
     <!-- 通用查询结果列 -->
     <sql id="Base_Column_List">
-        id, create_date, modify_date, area_id, email, is_admined, is_enabled, is_locked, locked_date, login_date, login_failure_count, login_ip, trade_merchant_no, name, parent_id, password, notice_id, type, username, phone, is_refund, if_foreign, open, promo_code_open, apply_start_time, apply_end_time, code, pay_platform, relation_admin_id
+        id, create_date, modify_date, area_id, email, is_admined, is_enabled, is_locked,
+        locked_date, login_date, login_failure_count, login_ip, trade_merchant_no, name,
+        parent_id, password, notice_id, type, username, phone, is_refund, if_foreign, open,
+        promo_code_open, apply_start_time, apply_end_time, code, pay_platform, relation_admin_id,
+        company_type
     </sql>
 
 </mapper>

src/main/java/com/szwl/model/entity/TAdmin.java

@@ -107,6 +107,10 @@ public class TAdmin implements Serializable {
 
     @ApiModelProperty(value = "关联商家，相当于以前的parent_id")
     private String relationAdminId;
+
+    @ApiModelProperty(value = "公司平台，0或空为申泽，1为七云")
+    private String companyType;
+
     @Transient
     public String getManagerId() {
 

src/main/java/com/szwl/model/entity/TOrder.java

@@ -111,5 +111,7 @@ public class TOrder implements Serializable {
     @ApiModelProperty(value = "退款订单版本号")
     private String refundOrderNo;
 
+    @ApiModelProperty(value = "公司平台，0或空为申泽，1为七云")
+    private String companyType;
 
 }

src/main/java/com/szwl/service/impl/TJoinpayMchServiceImpl.java

@@ -387,9 +387,11 @@ public class TJoinpayMchServiceImpl extends ServiceImpl<TJoinpayMchMapper, TJoin
             if(!StringUtils.isEmpty(tradeMerchantNo)){
                 if(tradeMerchantNo.equals("777150700323486")){
                     data.add(new BasicNameValuePair("q8_TerminalNo", "000001EC"));
-                }else if(tradeMerchantNo.equals("777164600304087")){
+                } else if(tradeMerchantNo.equals("777164600304087")){
                     data.add(new BasicNameValuePair("q8_TerminalNo", "000001ED"));
-                }else {
+                } else if(tradeMerchantNo.equals("777138500523174")){ // 七云科技
+                    data.add(new BasicNameValuePair("q8_TerminalNo", "000009F7"));
+                } else {
                     data.add(new BasicNameValuePair("q8_TerminalNo", "000001EE"));
                 }
             }else {