销售订单-订单提交时补充的返利信息实体

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModel.java

@@ -52,6 +52,8 @@ public class BusSalesOrderModel extends BaseEntity {
 
     @ApiModelProperty("销售订单sid")
     private String salesOrderSid;
+    @ApiModelProperty(value = "品牌sid")
+    private String brandSid;
     @ApiModelProperty(value = "品牌")
     private String brandName;
     @ApiModelProperty("车型sid")

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordermodel/BusSalesOrderModelDetailsVo.java

@@ -70,5 +70,9 @@ public class BusSalesOrderModelDetailsVo implements Vo {
     @ApiModelProperty("单台成交价")
     @JsonSerialize(using = ToStringSerializer.class)
     private String finalPrice;
+    @ApiModelProperty(value = "品牌sid")
+    private String brandSid;
+    @ApiModelProperty(value = "品牌")
+    private String brandName;
 
 }

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordersubmit/BusSalesOrderSubmit.java

@@ -0,0 +1,41 @@
+package com.yxt.anrui.buscenter.api.bussalesordersubmit;
+
+import com.yxt.common.core.domain.BaseEntity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.math.BigDecimal;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/5/20 9:20
+ * @Description
+ */
+@Data
+public class BusSalesOrderSubmit extends BaseEntity {
+    private static final long serialVersionUID = 1919809277011946278L;
+    @ApiModelProperty(value = "销售订单sid")
+    private String salesOrderSid;
+    @ApiModelProperty(value = "价格说明")
+    private String priceRemarks;
+
+    @ApiModelProperty(value = "优惠说明")
+    private String discountRemarks;
+    @ApiModelProperty(value = "中介名称")
+    private String distributorName;
+    @ApiModelProperty(value = "联系电话")
+    private String distributorMobile;
+
+    @ApiModelProperty(value = "中介单位sid")
+    private String distributorSid;
+    @ApiModelProperty(value = "单车中介服务费")
+    private BigDecimal distributorPrice;
+    @ApiModelProperty(value = "返利合计")
+    private BigDecimal distributorPriceAll;
+    @ApiModelProperty(value = "内部引荐人")
+    private String name;
+    @ApiModelProperty(value = "内部引荐人sid")
+    private String userSid;
+
+
+}

anrui-buscenter/anrui-buscenter-api/src/main/java/com/yxt/anrui/buscenter/api/bussalesordersubmit/BusSalesOrderSubmitDto.java

@@ -0,0 +1,38 @@
+package com.yxt.anrui.buscenter.api.bussalesordersubmit;
+
+import com.yxt.common.core.dto.Dto;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/5/20 9:29
+ * @Description
+ */
+@Data
+public class BusSalesOrderSubmitDto implements Dto {
+    private static final long serialVersionUID = 4276394815492406556L;
+
+    @ApiModelProperty(value = "价格说明")
+    private String priceRemarks;
+
+    @ApiModelProperty(value = "优惠说明")
+    private String discountRemarks;
+    @ApiModelProperty(value = "中介名称")
+    private String distributorName;
+    @ApiModelProperty(value = "联系电话")
+    private String distributorMobile;
+
+    @ApiModelProperty(value = "中介单位sid")
+    private String distributorSid;
+    @ApiModelProperty(value = "单车中介服务费")
+    private String distributorPrice;
+    @ApiModelProperty(value = "返利合计")
+    private String distributorPriceAll;
+    @ApiModelProperty(value = "内部引荐人")
+    private String name;
+    @ApiModelProperty(value = "内部引荐人sid")
+    private String userSid;
+
+
+}

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesorder/BusSalesOrderService.java

@@ -238,9 +238,9 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         BusSalesOrderDetailsVo vo = new BusSalesOrderDetailsVo();
         BeanUtil.copyProperties(entity, vo);
         vo.setCreateDate(DateUtil.formatDate(entity.getCreateDate()));
-        if(!entity.getCustomerPhoto().contains(fileUploadComponent.getUrlPrefix())){
-            vo.setCustomerPhoto(fileUploadComponent.getUrlPrefix()+entity.getCustomerPhoto());
-        }else{
+        if (!entity.getCustomerPhoto().contains(fileUploadComponent.getUrlPrefix())) {
+            vo.setCustomerPhoto(fileUploadComponent.getUrlPrefix() + entity.getCustomerPhoto());
+        } else {
             vo.setCustomerPhoto(entity.getCustomerPhoto());
         }
         //查询主车车型信息
@@ -365,10 +365,20 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         if ("1".equals(dto.getIsTop())) {
             //上装价格
             BusSalesOrderMakeupDto busSalesOrderMakeup = dto.getBusSalesOrderMakeup();
+            if (StringUtils.isBlank(busSalesOrderMakeup.getTopName())) {
+                return rb.setMsg("包含上装下上装名称不能为空");
+            }
             String topPrice = busSalesOrderMakeup.getTopPrice();
-//            String topPrice = dto.getBusSalesOrderMakeup().getTopPrice();
-            singleGuildPriceBig = singleGuildPriceBig.add(new BigDecimal(topPrice));
-            singleFinalPriceBig = singleFinalPriceBig.add(new BigDecimal(topPrice));
+            if(StringUtils.isNotBlank(topPrice)){
+                singleGuildPriceBig = singleGuildPriceBig.add(new BigDecimal(topPrice));
+                singleFinalPriceBig = singleFinalPriceBig.add(new BigDecimal(topPrice));
+            }
+        }
+        if("1".equals(dto.getIsInsurance())){
+            BusSalesOrderInsuranceDto busSalesOrderInsurance = dto.getBusSalesOrderInsurance();
+            if(StringUtils.isBlank(busSalesOrderInsurance.getInsuranceName())){
+                return rb.setMsg("公司入保下保险公司名称不能为空");
+            }
         }
         //单台指导价（主车+上装价格）
         String singleGuildPrice = dto.getBusSalesOrderPrice().getSingleGuildPrice();
@@ -429,7 +439,7 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
             //判断补交金额和订金合计-本次结转金额
             String makeUpDeposit = dto.getBusSalesOrderDeposit().getMakeUpDeposit();
             if (StringUtils.isNotBlank(makeUpDeposit)) {
-                if(depositBig.compareTo(new BigDecimal(depositAll))>0){
+                if (depositBig.compareTo(new BigDecimal(depositAll)) > 0) {
                     return rb.setMsg("本次结转金额之和已超订金合计金额");
                 }
                 if (new BigDecimal(makeUpDeposit).compareTo(new BigDecimal(depositAll).subtract(depositBig)) != 0) {
@@ -462,8 +472,8 @@ public class BusSalesOrderService extends MybatisBaseService<BusSalesOrderMapper
         List<BusDepositFictitiousDto> busDepositFictitiousDtoList = dto.getBusDepositFictitiousList();
         BusSalesOrder busSalesOrder = fetchBySid(dto.getSid());
         BeanUtil.copyProperties(dto, busSalesOrder, "sid");
-        if(dto.getCustomerPhoto().contains(fileUploadComponent.getUrlPrefix())){
-            busSalesOrder.setCustomerPhoto(dto.getCustomerPhoto().replace(fileUploadComponent.getUrlPrefix(),""));
+        if (dto.getCustomerPhoto().contains(fileUploadComponent.getUrlPrefix())) {
+            busSalesOrder.setCustomerPhoto(dto.getCustomerPhoto().replace(fileUploadComponent.getUrlPrefix(), ""));
         }
         baseMapper.updateById(busSalesOrder);
         //主车车型信息保存

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordermodel/BusSalesOrderModelMapper.xml

@@ -41,7 +41,9 @@
                moreConfig,
                specialConfig,
                guildPrice,
-               finalPrice
+               finalPrice,
+               brandName,
+               brandSid
         from bus_sales_order_model
         where salesOrderSid = #{sid}
     </select>

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordersubmit/BusSalesOrderSubmitMapper.java

@@ -0,0 +1,14 @@
+package com.yxt.anrui.buscenter.biz.bussalesordersubmit;
+
+import com.baomidou.mybatisplus.core.mapper.BaseMapper;
+import com.yxt.anrui.buscenter.api.bussalesordersubmit.BusSalesOrderSubmit;
+import org.apache.ibatis.annotations.Mapper;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/5/20 9:35
+ * @Description
+ */
+@Mapper
+public interface BusSalesOrderSubmitMapper extends BaseMapper<BusSalesOrderSubmit> {
+}

anrui-buscenter/anrui-buscenter-biz/src/main/java/com/yxt/anrui/buscenter/biz/bussalesordersubmit/BusSalesOrderSubmitService.java

@@ -0,0 +1,14 @@
+package com.yxt.anrui.buscenter.biz.bussalesordersubmit;
+
+import com.yxt.anrui.buscenter.api.bussalesordersubmit.BusSalesOrderSubmit;
+import com.yxt.common.base.service.MybatisBaseService;
+import org.springframework.stereotype.Service;
+
+/**
+ * @Author dimengzhe
+ * @Date 2022/5/20 9:31
+ * @Description
+ */
+@Service
+public class BusSalesOrderSubmitService extends MybatisBaseService<BusSalesOrderSubmitMapper, BusSalesOrderSubmit> {
+}