merge

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/bo/OrderInvoiceAddBo.java

@@ -109,4 +109,6 @@ public class OrderInvoiceAddBo {
     private Long periodTime;
     @ApiModelProperty("订单商品ID数组")
     private List<Long> orderGoodsIds;
+    @ApiModelProperty("发票备注")
+    private String invoiceRemark;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/order/service/impl/OrderServiceImpl.java

@@ -1047,8 +1047,8 @@ public class OrderServiceImpl extends ServiceImpl<OrderMapper, Order> implements
                     }
 
                     if ((ObjectUtils.isNull(x.getMinValue()) && ObjectUtils.isNull(x.getMaxValue()))
-                            || (price.compareTo(x.getMinValue()) > 0 && price.compareTo(x.getMaxValue()) < 0)
-                            || (price.compareTo(x.getMinValue()) == 0 && price.compareTo(x.getMaxValue()) == 0)){
+                            || (price.compareTo(x.getMinValue()) > 0 && (x.getMaxValue().compareTo(new BigDecimal("-1.00")) == 0 || price.compareTo(x.getMaxValue()) < 0))
+                            || (price.compareTo(x.getMinValue()) == 0 && (x.getMaxValue().compareTo(new BigDecimal("-1.00")) == 0 || price.compareTo(x.getMaxValue()) == 0))){
                         tpItems.add(x);
                     }
                 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/bo/TopOldOrderAddBo.java

@@ -185,4 +185,7 @@ public class TopOldOrderAddBo {
 
     @ApiModelProperty("下单企业")
     private String purchaseOrg;
+
+    @ApiModelProperty("是否需要完单标识：0不需要，1需要")
+    private Integer finishSign;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/bo/TopOldOrderGoodsAddBo.java

@@ -87,4 +87,8 @@ public class TopOldOrderGoodsAddBo {
     private String userCard;
     @ApiModelProperty("学员手机号码")
     private String userPhone;
+    @ApiModelProperty("分成模式 1机构分成 2业务员分成")
+    private Integer divideModel;
+    @ApiModelProperty("分成钱")
+    private BigDecimal divideMoney;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/domain/TopOldOrder.java

@@ -150,4 +150,6 @@ private static final long serialVersionUID=1L;
     private Long creditTime;
     /** 下单企业 */
     private String purchaseOrg;
+    /** 是否需要完单标识：0不需要，1需要 */
+    private Integer finishSign;
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/top/goods/vo/TopOldOrderVo.java

@@ -273,4 +273,10 @@ public class TopOldOrderVo {
 
 	@ApiModelProperty("下单企业")
 	private String purchaseOrg;
+
+	@ApiModelProperty("审核标识：0审核，1不审核")
+	private Integer commercialTenant;
+
+	@ApiModelProperty("是否需要完单标识：0不需要，1需要")
+	private Integer finishSign;
 }