bug修改 调整了代理商对应代码修改

common/fire-dto/src/main/java/com/fire/supplier/dto/MakeOrderRequestBody.java

@@ -30,7 +30,7 @@ public class MakeOrderRequestBody {
 
     @ApiModelProperty(value = "支付子渠道,0-不区分,1-46,2-16,3-0097,4-0074,5-1818")
     @JsonProperty("sub_channel")
-    private Integer subChannelId;
+    private Long subChannelId;
 
     @ApiModelProperty(value = "运营商", required = true)
     @JsonProperty("carrier_id")
@@ -102,11 +102,11 @@ public class MakeOrderRequestBody {
         this.channelId = channelId;
     }
 
-    public Integer getSubChannelId() {
+    public Long getSubChannelId() {
         return subChannelId;
     }
 
-    public void setSubChannelId(Integer subChannelId) {
+    public void setSubChannelId(Long subChannelId) {
         this.subChannelId = subChannelId;
     }
 }

modules/distribution/src/main/resources/mapper/CustomerInfoMapper.xml

@@ -4,7 +4,6 @@
 
     <resultMap type="com.fire.dto.CustomerInfo" id="CustomerInfoMap">
         <result property="customerId" column="customer_id" jdbcType="BIGINT"/>
-        <result property="partnerId" column="partner_id" jdbcType="INTEGER"/>
         <result property="customerName" column="customer_name" jdbcType="VARCHAR"/>
         <result property="shorterName" column="shorter_name" jdbcType="VARCHAR"/>
         <result property="linkmanName" column="linkman_name" jdbcType="VARCHAR"/>
@@ -21,7 +20,6 @@
         <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
         <result property="updator" column="updator" jdbcType="VARCHAR"/>
         <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
-        <result property="partnerCommission" column="partner_commission"/>
         <result property="userId" column="user_id" jdbcType="BIGINT"/>
         <result property="priceCheck" column="price_check" jdbcType="INTEGER"/>
     </resultMap>
@@ -33,7 +31,6 @@
 
     <sql id="baseSql">
         select customer_id,
-               partner_id,
                customer_name,
                shorter_name,
                linkman_name,

modules/make-order-supplier/src/main/java/com/fire/order/supplier/service/impl/MakeOrderSupplierServiceImpl.java

@@ -83,8 +83,8 @@ public class MakeOrderSupplierServiceImpl implements MakeOrderSupplierService {
         body.setMerchantOrderNo(String.valueOf(orderInfo.getOrderId() + orderInfo.getSendCount()));
         body.setEvictSeconds(System.currentTimeMillis() / 1000);
         body.setAccountNo(orderInfo.getPhoneNo());
-        body.setChannelId(orderInfo.getChannelId());
-        body.setSubChannelId(21);
+        body.setChannelId(supplier.getSupplierId());
+        body.setSubChannelId(orderInfo.getChannelId());
         body.setCarrierId(orderInfo.getPhoneOperator());
         double facePrice = BigDecimal.valueOf(orderInfo.getFlowAmount() / 10000).doubleValue();
         body.setFacePrice(facePrice);

modules/make-order/src/main/resources/mapper/CustomerInfoMapper.xml

@@ -4,7 +4,6 @@
 
     <resultMap type="com.fire.dto.CustomerInfo" id="CustomerInfoMap">
         <result property="customerId" column="customer_id" jdbcType="BIGINT"/>
-        <result property="partnerId" column="partner_id" jdbcType="INTEGER"/>
         <result property="customerName" column="customer_name" jdbcType="VARCHAR"/>
         <result property="shorterName" column="shorter_name" jdbcType="VARCHAR"/>
         <result property="linkmanName" column="linkman_name" jdbcType="VARCHAR"/>
@@ -21,7 +20,6 @@
         <result property="createTime" column="create_time" jdbcType="TIMESTAMP"/>
         <result property="updator" column="updator" jdbcType="VARCHAR"/>
         <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
-        <result property="partnerCommission" column="partner_commission"/>
         <result property="userId" column="user_id" jdbcType="BIGINT"/>
         <result property="priceCheck" column="price_check" jdbcType="INTEGER"/>
     </resultMap>
@@ -33,7 +31,6 @@
 
     <sql id="baseSql">
         select customer_id,
-               partner_id,
                customer_name,
                shorter_name,
                linkman_name,