bug修改 代理商结算价格

common/fire-dto/src/main/java/com/fire/dto/FlowOrderInfo.java

@@ -3,15 +3,23 @@ package com.fire.dto;
 import com.baomidou.mybatisplus.annotation.TableField;
 import com.baomidou.mybatisplus.annotation.TableId;
 import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.util.Date;
 
 @ApiModel(value = "订单记录表实体")
 @Data
 @TableName("flow_order_info")
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class FlowOrderInfo {
 
     @ApiModelProperty(value = "接入ID号")

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

@@ -27,6 +27,7 @@ import org.springframework.util.DigestUtils;
 import redis.clients.jedis.JedisCluster;
 
 import javax.annotation.Resource;
+import java.math.BigDecimal;
 import java.nio.charset.StandardCharsets;
 import java.util.ArrayList;
 import java.util.Date;
@@ -308,27 +309,35 @@ public class MakeOrderServiceImpl implements MakeOrderService {
             return responseDto;
         }
 
+        long partnerBalancePrice = 0L;
+        if (customerInfo.getPartnerCommission() != null) {
+            partnerBalancePrice = customerInfo.getPartnerCommission().multiply(new BigDecimal(product.getFacePrice())).longValue();
+        }
+
         //初始化订单详情
-        FlowOrderInfo order = new FlowOrderInfo();
-        order.setFlowAppId(flowAppInfo.getFlowAppId());
-        order.setOrderId(orderId);
-        order.setPackageId(product.getPackageId());
-        order.setCustomerId(flowAppInfo.getCustomerId());
-        order.setOrderType(product.getType());
-        order.setCustomerName(customerInfo.getCustomerName());
-        order.setPhoneNo(phoneNo);
-        order.setExtorderId(content.getExtOrder());
-        order.setApplyDate(new Date());
-        order.setStatus(ORDER_IN_QUEUE.status());
-        order.setFlowAmount(product.getFacePrice());
-        order.setAreaCode(product.getAreaNum());
-        order.setPrice(product.getPrice());
-        order.setProductId(product.getProductId());
-        order.setCustomerProductId(product.getCustomerProductId());
-        order.setPhoneOperator(product.getOperator());
-        order.setPhoneCity(phoneZone.getAreaCode());
-        order.setAppId(appId);
-        order.setPhoneHome(phoneZone.getProvince() + "-" + phoneZone.getCity());
+        FlowOrderInfo order = FlowOrderInfo.builder()
+                .flowAppId(flowAppInfo.getFlowAppId())
+                .orderId(orderId)
+                .packageId(product.getPackageId())
+                .customerId(flowAppInfo.getCustomerId())
+                .orderType(product.getType())
+                .customerName(customerInfo.getCustomerName())
+                .phoneNo(phoneNo)
+                .extorderId(content.getExtOrder())
+                .applyDate(new Date())
+                .status(ORDER_IN_QUEUE.status())
+                .flowAmount(product.getFacePrice())
+                .areaCode(product.getAreaNum())
+                .price(product.getPrice())
+                .productId(product.getProductId())
+                .customerProductId(product.getCustomerProductId())
+                .phoneOperator(product.getOperator())
+                .phoneCity(phoneZone.getAreaCode())
+                .appId(appId)
+                .phoneHome(phoneZone.getProvince() + "-" + phoneZone.getCity())
+                .partnerBalancePrice(partnerBalancePrice)
+                .build();
+
 
         //订单转换为json入redis
         String orderStr;

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

@@ -22,6 +22,7 @@
         <result property="updateTime" column="update_time" jdbcType="TIMESTAMP"/>
         <result property="userId" column="user_id" jdbcType="BIGINT"/>
         <result property="priceCheck" column="price_check" jdbcType="INTEGER"/>
+        <result property="partnerCommission" column="partner_commission"/>
     </resultMap>
 
     <!--查询全部-->