问题处理

hx-jxst/src/main/java/com/fjhx/jxst/entity/sales/vo/SalesContractVo.java

@@ -59,6 +59,16 @@ public class SalesContractVo extends SalesContract {
     private String buyCityName;
 
     /**
+     * 客户详细地址
+     */
+    private String buyAddress;
+
+    /**
+     * 买方税号
+     */
+    private String buyDutyParagraph;
+
+    /**
      * 卖方公司名称
      */
     private String sellCorporationName;

hx-jxst/src/main/java/com/fjhx/jxst/service/sales/impl/SalesContractServiceImpl.java

@@ -116,6 +116,8 @@ public class SalesContractServiceImpl extends ServiceImpl<SalesContractMapper, S
             result.setBuyCountryName(areaMapByIds.get(customer.getCountryId()));
             result.setBuyProvinceName(areaMapByIds.get(customer.getProvinceId()));
             result.setBuyCityName(areaMapByIds.get(customer.getCityId()));
+            result.setBuyAddress(customer.getAddress());
+            result.setBuyDutyParagraph(customer.getDutyParagraph());
         }
         //赋值客户更多联系人
         List<CustomerUser> customerUserList = customerUserService.list(q -> q.eq(CustomerUser::getCustomerId, salesContract.getCustomerId()));
@@ -140,11 +142,11 @@ public class SalesContractServiceImpl extends ServiceImpl<SalesContractMapper, S
     @Override
     public void add(SalesContractDto salesContractDto) {
         List<SalesContractDetails> salesContractDetailsList = salesContractDto.getSalesContractDetailsList();
-        BigDecimal count = BigDecimal.ZERO;
-        for (SalesContractDetails salesContractDetails : salesContractDetailsList) {
-            count.add(salesContractDetails.getUnitPrice().multiply(salesContractDetails.getQuantity()));
-        }
-        salesContractDto.setContractAmount(count);
+//        BigDecimal count = BigDecimal.ZERO;
+//        for (SalesContractDetails salesContractDetails : salesContractDetailsList) {
+//            count = count.add(salesContractDetails.getUnitPrice().multiply(salesContractDetails.getQuantity()));
+//        }
+//        salesContractDto.setContractAmount(count);
         salesContractDto.setCode(CodeEnum.SALES_CONTRACT.getCode());
         this.save(salesContractDto);
         for (SalesContractDetails salesContractDetails : salesContractDetailsList) {

hx-jxst/src/main/resources/mapper/sales/SalesContractMapper.xml

@@ -14,7 +14,8 @@
             sc.create_time,
             sc.update_user,
             sc.update_time,
-            (SELECT sum(unit_price * quantity) FROM sales_contract_details WHERE sales_contract_id = sc.id) contractAmount,
+            sc.contract_amount,
+            (SELECT sum(unit_price * quantity) FROM sales_contract_details WHERE sales_contract_id = sc.id) contractAmount0,
             sc.flow_id
         from sales_contract sc
             ${ew.customSqlSegment}