bizType

cif-service/src/main/java/com/txz/cif/web/mng/RedEnvelopeController.java

@@ -70,8 +70,8 @@ public class RedEnvelopeController {
 
         Condition condition = new Condition(RedEnvelope.class);
         Criteria criteria = condition.createCriteria();
-		if (param.getType() != null){
-			criteria.andEqualTo("type", param.getType());
+		if (param.getBizType() != null){
+			criteria.andEqualTo("BizType", param.getBizType());
 		}
 		if (StrUtil.isNotBlank(param.getName()) ){
 			criteria.andEqualTo("name", param.getName());

cif-service/src/main/java/com/txz/cif/web/para/RedEnvelopeListParam2.java

@@ -36,13 +36,8 @@ public class RedEnvelopeListParam2 {
     @ApiModelProperty(value="状态 1待结算 2已结算 ")
     private Integer status;
 
-    @ApiModelProperty(value="类型 OPEN_GROUP_RED_ENVELOPE( 5001, \"开团红包收益\"),\n" +
-            "    JOIN_GROUP_RED_ENVELOPE( 5002, \"参团红包收益\"),\n" +
-            "    SIGN_RED_ENVELOPE( 5003, \"签到红包收益\"),\n" +
-            "    FIRST_COMMISSION( 5004, \"一级佣金\"),\n" +
-            "    SECONDARY_COMMISSION( 5005, \"二级佣金\"),\n" +
-            "    PROMOTION_COMMISSION( 5006, \"直推佣金\"), ")
-    private Integer type;
+    @ApiModelProperty(value="类型 1001充值 2001提现  3001开团支付 3002参团支付  4001未成团退款 4002成团退款 5001开团红包收益 5002参团红包收益 5003签到红包收益 5004下级红包佣金 5005下下级红包佣金 6001充值返点 7001提现手续费")
+    private Integer bizType;
 
     @ApiModelProperty(value="开始时间 ")
     private String startTime;