添加了报价单的数据

hx-account/src/main/java/com/fjhx/account/service/account/impl/AccountRunningWaterServiceImpl.java

@@ -90,13 +90,25 @@ public class AccountRunningWaterServiceImpl extends ServiceImpl<AccountRunningWa
         this.save(accountRunningWaterDto);
     }
 
+
     /**
-     * 修改余额表的信息
-     *
-     * @param accountRunningWaterDto
+     * 账户资金流水表编辑
      */
     @Override
+    @Transactional(rollbackFor = {Exception.class})
     public void edit(AccountRunningWater accountRunningWaterDto) {
+//        //查询资金流水表的数据
+//        AccountRunningWater accountRunningWater = this.getById(accountRunningWaterDto.getId());
+//
+//        //修改账户余额表的余额
+//        AccountRemainder accountRemainder = accountRemainderService.getOne(Wrappers.<AccountRemainder>lambdaQuery()
+//                .eq(AccountRemainder::getAccountManagementId,accountRunningWater.getAccountManagementId())
+//                .eq(AccountRemainder::getCurrency,accountRunningWater.getCurrency())
+//        );
+//        if (accountRemainder.getStatus().equals("10")){
+//            if (accountRemainder.getRemainder().compareTo(accountRunningWater.getAmount())==1)
+//        }
+
         this.updateById(accountRunningWaterDto);
     }
 

hx-sale/src/main/java/com/fjhx/sale/controller/sale/SaleQuotationController.java

@@ -1,6 +1,7 @@
 package com.fjhx.sale.controller.sale;
 
 import com.fjhx.customer.entity.customer.dto.CustomerDto;
+import com.fjhx.customer.entity.customer.dto.CustomerSelectDto;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.fjhx.sale.entity.sale.vo.SaleQuotationVo;
@@ -83,9 +84,9 @@ public class SaleQuotationController {
      * 销售明细（客户画像）
      */
     @PostMapping("/saleDetail")
-    public Map<String,Object> saleDetail(@RequestBody CustomerDto dto) {
-//        return saleQuotationService.saleDetail(dto);
-        return null;
+    public  Page<SaleQuotationVo> saleDetail(@RequestBody CustomerSelectDto dto) {
+        return saleQuotationService.saleDetail(dto);
+
     }
 
 

hx-sale/src/main/java/com/fjhx/sale/entity/sale/vo/SaleQuotationVo.java

@@ -6,6 +6,7 @@ import com.fjhx.sale.entity.sale.po.SaleQuotation;
 import lombok.Getter;
 import lombok.Setter;
 
+import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -37,4 +38,14 @@ public class SaleQuotationVo extends SaleQuotation {
      *报价 -收费项目表
      */
     private List<QuotationPay> quotationPayList;
+
+    /**
+     * 预付款
+     */
+    private BigDecimal advanceCharge;
+
+    /**
+     * 类型 10 为报价单  20 合同
+     */
+    private Integer type;
 }

hx-sale/src/main/java/com/fjhx/sale/mapper/sale/SaleQuotationMapper.java

@@ -2,6 +2,7 @@ package com.fjhx.sale.mapper.sale;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.fjhx.customer.entity.customer.dto.CustomerDto;
+import com.fjhx.customer.entity.customer.dto.CustomerSelectDto;
 import com.fjhx.sale.entity.sale.po.SaleQuotation;
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -39,4 +40,6 @@ public interface SaleQuotationMapper extends BaseMapper<SaleQuotation> {
      * @return
      */
     List<SaleQuotationVo> getAmount(CustomerDto dto);
+
+    Page<SaleQuotationVo> saleDetail(@Param("page") Page<Object> page,@Param("dto") CustomerSelectDto dto);
 }

hx-sale/src/main/java/com/fjhx/sale/service/sale/SaleQuotationService.java

@@ -1,6 +1,7 @@
 package com.fjhx.sale.service.sale;
 
 import com.fjhx.customer.entity.customer.dto.CustomerDto;
+import com.fjhx.customer.entity.customer.dto.CustomerSelectDto;
 import com.fjhx.sale.entity.sale.po.SaleQuotation;
 import com.ruoyi.common.core.service.BaseService;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
@@ -80,4 +81,9 @@ public interface SaleQuotationService extends BaseService<SaleQuotation> {
      * 销售走势（客户画像）
      */
     Map<String, Object> salesTrend(CustomerDto dto);
+
+    /**
+     * 销售明细（客户画像）
+     */
+    Page<SaleQuotationVo> saleDetail(CustomerSelectDto dto);
 }

hx-sale/src/main/java/com/fjhx/sale/service/sale/impl/SaleQuotationServiceImpl.java

@@ -6,8 +6,10 @@ import com.baomidou.dynamic.datasource.toolkit.DynamicDataSourceContextHolder;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.fjhx.account.controller.utils.DateUtils;
+import com.fjhx.account.entity.account.vo.AccountPaymentVo;
 import com.fjhx.common.constant.SourceConstant;
 import com.fjhx.customer.entity.customer.dto.CustomerDto;
+import com.fjhx.customer.entity.customer.dto.CustomerSelectDto;
 import com.fjhx.sale.entity.contract.vo.ContractVo;
 import com.fjhx.sale.entity.quotation.po.QuotationPay;
 import com.fjhx.sale.entity.quotation.po.QuotationProduct;
@@ -261,6 +263,18 @@ public class SaleQuotationServiceImpl extends ServiceImpl<SaleQuotationMapper, S
         return map;
     }
 
+    /**
+     * 销售明细（客户画像）
+     */
+    @Override
+    public  Page<SaleQuotationVo> saleDetail(CustomerSelectDto dto) {
+        Page<SaleQuotationVo> saleQuotationVoPage = baseMapper.saleDetail(dto.getPage(), dto);
+        List<SaleQuotationVo> records = saleQuotationVoPage.getRecords();
+        // 赋值用户名称
+        UserUtil.assignmentNickName(records, SaleQuotationVo::getCreateUser, SaleQuotationVo::setUserName);
+
+        return saleQuotationVoPage;
+    }
 
 
 }

hx-sale/src/main/resources/mapper/documents/DocumentsMapper.xml

@@ -5,7 +5,7 @@
         select
             d.id,
             d.contract_id,
-            d.pack_shipment_id,
+            d.port_of_destination,
             d.remark,
             d.country_id,
             d.update_time,

hx-sale/src/main/resources/mapper/sale/SaleQuotationMapper.xml

@@ -63,5 +63,31 @@
         GROUP BY
             time
     </select>
+    <select id="saleDetail" resultType="com.fjhx.sale.entity.sale.vo.SaleQuotationVo">
+        SELECT
+            create_time,
+            create_user,
+            IFNULL(advance_ratio,0) advanceRatio,
+            amount,
+            ifnull(ROUND((amount * advance_ratio/100),2),0) advanceCharge,
+            buy_contact_name,
+            10 as type
+        FROM
+            sale_quotation
+        WHERE
+            buy_corporation_id = #{dto.id}
+        UNION
+        SELECT
+            create_time,
+            create_user,
+            IFNULL(advance_ratio,0) advanceRatio,
+            amount,
+            ifnull(ROUND((amount * advance_ratio/100),2),0) advanceCharge,
+            buy_contact_name,
+            20 as type
+        FROM contract
+        WHERE
+            buy_corporation_id = #{dto.id}
+    </select>
 
 </mapper>