caozj пре 1 година
родитељ
комит
8b1b039da4

+ 28 - 0
hx-sale/src/main/java/com/fjhx/sale/entity/commission/po/Commission.java

@@ -111,5 +111,33 @@ public class Commission extends BasePo {
      */
     private Integer settlementStatus;
 
+    /**
+     * 客户名称
+     */
+    private String customerName;
+
+    /**
+     * 业务员名称
+     */
+    private String userName;
+
+    /**
+     * 采购金额
+     */
+    private BigDecimal purchaseAmount;
 
+    /**
+     * 合同金额
+     */
+    private BigDecimal contractAmount;
+
+    /**
+     * 销售合同币种
+     */
+    private String contractCurrency;
+
+    /**
+     * 采购合同币种
+     */
+    private String purchaseCurrency;
 }

+ 1 - 1
hx-sale/src/main/java/com/fjhx/sale/service/commission/impl/CommissionServiceImpl.java

@@ -55,7 +55,7 @@ public class CommissionServiceImpl extends ServiceImpl<CommissionMapper, Commiss
      */
     @Override
     public void settlement(CommissionDto commissionDto) {
-        if (ObjectUtil.isEmpty(commissionDto.getCommissionRule()) || ObjectUtil.isEmpty(commissionDto.getSettlementStatus())){
+        if (ObjectUtil.isEmpty(commissionDto.getSettlementStatus())){
             throw  new ServiceException("参数缺失:结算状态或业绩提成规则表不能为null");
         }