更改bug

mtp3-century/src/main/resources/mapper/ReckonDaydividecountdetailMapper.xml

@@ -1630,8 +1630,8 @@
                     <if test="vo.parentuserid != null">
                         <![CDATA[and t.parentuserid = #{vo.parentuserid}]]>
                     </if>
-                    <if test="vo.accountid != null">
-                        <![CDATA[and t.accountid = #{vo.accountid}]]>
+                    <if test="vo.areaaccountid != null">
+                        <![CDATA[and t.accountid = #{vo.areaaccountid}]]>
                     </if>
                     <if test="vo.areaid != null">
                         <![CDATA[and t.areaid = #{vo.areaid}]]>
@@ -1640,7 +1640,7 @@
                         <choose>
                             <when test="vo.searchtype==1">
                                 <!-- and t.marketid = #{goodsid,jdbcType=DECIMAL} -->
-                                and t.goodsid = #{vgoodsid,jdbcType=DECIMAL}
+                                and t.goodsid = #{vo.goodsid,jdbcType=DECIMAL}
                             </when>
                             <otherwise>
                                 and t.goodsid = #{vo.goodsid,jdbcType=DECIMAL}

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/investor/UserinfoDetailVo.java

@@ -25,8 +25,7 @@ public class UserinfoDetailVo {
     private Integer userinfoType = 0;
 
     @ApiModelProperty(value = "userinfo -- 证件类型/code-certificatetype")
-    @Builder.Default
-    private Integer cardTypeId = 0;
+    private Integer cardTypeId;
 
     @ApiModelProperty(value = "userinfo -- 证件号码")
     @Builder.Default
@@ -59,7 +58,8 @@ public class UserinfoDetailVo {
 
     private Long countryid;
 
-    private String countryName;
+    @Builder.Default
+    private String countryName = "";
 
     private Long provinceid;
 

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/reportform/ReckonDivideOrderDetailParam.java

@@ -17,11 +17,11 @@ public class ReckonDivideOrderDetailParam {
 
     private String orgztypes;
 
-    private String areaid;
+    private Long areaid;
 
-    private String goodsid;
+    private Long goodsid;
 
-    private String areaaccountid;
+    private Long areaaccountid;
 
     private Integer tradefeetype;
 
@@ -29,13 +29,13 @@ public class ReckonDivideOrderDetailParam {
 
     private Integer tradeproperty;
 
-    @ExcelProperty("开始日期")
+    @ApiModelProperty("开始日期")
     private String startDate;
 
-    @ExcelProperty("结束日期")
+    @ApiModelProperty("结束日期")
     private String endDate;
 
-    private Long searchtype;
+    private Integer searchtype;
 
     @ApiModelProperty(value = "* 页码 *")
     private Integer pageNum;

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/reportform/ReckonDivideOrderDetailResult.java

@@ -1,7 +1,7 @@
 package com.muchinfo.mtp3pojos.vo.reportform;
 
-import com.alibaba.excel.annotation.ExcelProperty;
 import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
@@ -16,19 +16,19 @@ import java.math.BigDecimal;
 @ApiModel(value = "ReckonDivideOrderDetailResult对象", description = "分润报表明细响应")
 public class ReckonDivideOrderDetailResult {
 
-    @ExcelProperty("源账户")
+    @ApiModelProperty("源账户")
     private String accountid;
 
-    @ExcelProperty("总费用金额")
+    @ApiModelProperty("总费用金额")
     private BigDecimal feeamount;
 
-    @ExcelProperty("分润算法")
+    @ApiModelProperty("分润算法")
     private Integer dividetype;
 
-    @ExcelProperty("分配值")
+    @ApiModelProperty("分配值")
     private BigDecimal dividevalue;
 
-    @ExcelProperty("分润金额")
+    @ApiModelProperty("分润金额")
     private BigDecimal divideamount;
 
     private Long relateduserid;

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/reportform/ShareAmountQueryResult.java

@@ -41,4 +41,14 @@ public class ShareAmountQueryResult {
     private String areaname;
 
     private Integer tradefeetype;
+
+    private Long areaid;
+
+    private Long goodsid;
+
+    private Long parentuserid;
+
+    private Long memberuserid;
+
+    private Integer tradeproperty;
 }