添加爆米花相关信息

src/main/java/com/szwl/controller/TOrderController.java

@@ -421,6 +421,7 @@ public class TOrderController {
         order.setStatus(0);
         order.setType(type);
         order.setCompanyType(admin.getCompanyType());
+        order.setMachineType(equipment.getMachineType());
         if(type==0){
             order.setAdminProportion(adminProportion);
             order.setAgencyProportion(agencyProportion);
@@ -807,6 +808,7 @@ public class TOrderController {
         order.setStatus(0);
         order.setType(type);
         order.setCompanyType(admin.getCompanyType());
+        order.setMachineType(equipment.getMachineType());
         if(type==0){
             order.setAdminProportion(adminProportion);
             order.setAgencyProportion(agencyProportion);
@@ -1198,6 +1200,7 @@ public class TOrderController {
         order.setStatus(0);
         order.setType(type);
         order.setCompanyType(admin.getCompanyType());
+        order.setMachineType(equipment.getMachineType());
         if(type==0){
             order.setAdminProportion(adminProportion);
             order.setAgencyProportion(agencyProportion);
@@ -1241,6 +1244,7 @@ public class TOrderController {
         order2.setStatus(0);
         order2.setPayPlatform(payPlatform);
         order2.setCompanyType(admin.getCompanyType());
+        order2.setMachineType(equipment.getMachineType());
         if(StringUtils.isNotEmpty(payPlatform)&&payPlatform.equals("1")){
             order2.setIsSettlement("0");
         }
@@ -1709,6 +1713,7 @@ public class TOrderController {
         order.setType(type);
         order.setProductNumber(productNumber);
         order.setCompanyType(admin.getCompanyType());
+        order.setMachineType(equipment.getMachineType());
         if(type==0){
             order.setAdminProportion(adminProportion);
             order.setAgencyProportion(agencyProportion);
@@ -1754,6 +1759,7 @@ public class TOrderController {
         order2.setType(type);
         order2.setProductNumber(productNumber);
         order2.setCompanyType(admin.getCompanyType());
+        order2.setMachineType(equipment.getMachineType());
         if(type==0){
             order2.setAdminProportion(adminProportion);
             order2.setAgencyProportion(agencyProportion);
@@ -2318,6 +2324,7 @@ public class TOrderController {
         order.setMarketingAmount(marketingAmount);
         order.setProductNumber(productNumber);
         order.setCompanyType(admin.getCompanyType());
+        order.setMachineType(equipment.getMachineType());
         if(couponList.size()>0){
             order.setCoupons(couponList.toString());
         }

src/main/java/com/szwl/model/entity/TOrder.java

@@ -16,7 +16,7 @@ import lombok.EqualsAndHashCode;
  * </p>
  *
  * @author wuhs
- * @since 2023-05-18
+ * @since 2023-08-18
  */
 @Data
 @EqualsAndHashCode(callSuper = false)
@@ -25,64 +25,95 @@ public class TOrder implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
+    @ApiModelProperty(value = "订单唯一ID")
+    @TableId(value = "id", type = IdType.AUTO)
     private Long id;
 
+    @ApiModelProperty(value = "创建时间")
     private Date createDate;
 
+    @ApiModelProperty(value = "修改时间")
     private Date modifyDate;
 
+    @ApiModelProperty(value = "用户ID")
     private Long adminId;
 
+    @ApiModelProperty(value = "平台分账")
     private BigDecimal adminProportion;
 
+    @ApiModelProperty(value = "一级分销商户ID")
     private Long agencyId;
 
+    @ApiModelProperty(value = "一级分账比例")
     private BigDecimal agencyProportion;
 
+    @ApiModelProperty(value = "分销逻辑")
     private String altInfo;
 
+    @ApiModelProperty(value = "设备编号")
     private String clientId;
 
+    @ApiModelProperty(value = "设备ID")
     private Long equipmentId;
 
+    @ApiModelProperty(value = "支付方式")
     private String frpCode;
 
+    @ApiModelProperty(value = "二级分销商户ID")
     private Long merchantId;
 
+    @ApiModelProperty(value = "二级分账比例")
     private BigDecimal merchantProportion;
 
+    @ApiModelProperty(value = "支付时间")
     private Date payDate;
 
+    @ApiModelProperty(value = "三级分销商户ID")
     private Long personageId;
 
+    @ApiModelProperty(value = "三级分账比例")
     private BigDecimal personageProportion;
 
+    @ApiModelProperty(value = "订单金额")
     private BigDecimal price;
 
+    @ApiModelProperty(value = "商品ID")
     private Long productId;
 
+    @ApiModelProperty(value = "商品名称")
     private String productDesc;
 
+    @ApiModelProperty(value = "商品名称")
     private String productName;
 
+    @ApiModelProperty(value = "商品编号")
     private String productNo;
 
+    @ApiModelProperty(value = "退款时间")
     private Date refundDate;
 
+    @ApiModelProperty(value = "订单编号")
     private String sn;
 
+    @ApiModelProperty(value = "支付状态")
     private Integer status;
 
+    @ApiModelProperty(value = "0：分账方2个，1：分账方3个，3：分账方4个，3：分账方超4个")
     private Integer type;
 
+    @ApiModelProperty(value = "支付流水号")
     private String trxNo;
 
+    @ApiModelProperty(value = "退款流水号")
     private String refundTrxNo;
 
+    @ApiModelProperty(value = "是否发送到es")
     private String es;
 
+    @ApiModelProperty(value = "退款金额")
     private BigDecimal refundAmount;
 
+    @ApiModelProperty(value = "标记")
     private String note;
 
     @ApiModelProperty(value = "支付平台  0或null为汇聚，1为杉德支付")
@@ -91,8 +122,10 @@ public class TOrder implements Serializable {
     @ApiModelProperty(value = "是否结算 0或null为未结算，1已结算。仅杉德支付有这个")
     private String isSettlement;
 
+    @ApiModelProperty(value = "支付流水号")
     private Long wxId;
 
+    @ApiModelProperty(value = "分账详情，当分账超过4方时，这个字段才启用")
     private String proportionDesc;
 
     private BigDecimal marketingAmount;
@@ -114,4 +147,14 @@ public class TOrder implements Serializable {
     @ApiModelProperty(value = "公司平台，0或空为申泽，1为七云")
     private String companyType;
 
+    @ApiModelProperty(value = "汇付分账明细")
+    private String acctSplitBunch;
+
+    @ApiModelProperty(value = "退款数量")
+    private Integer refundQuantity;
+
+    @ApiModelProperty(value = "设备类型，0：棉花糖，1，爆米花")
+    private String machineType;
+
+
 }