权星相关接口修复

mall-admin/src/main/java/com/macro/mall/controller/member/UmsMemberController.java

@@ -40,13 +40,20 @@ public class UmsMemberController {
     @ResponseBody
     public CommonResult insertMember(@ApiParam("手机号") @RequestParam("phone") String phone,@ApiParam("用户名") @RequestParam("username") String username,
     @ApiParam("名字") @RequestParam("name") String name,@ApiParam("账户类型（0管理员1供应商2分销商）") @RequestParam("accouuntType") Integer accouuntType
-    ,@ApiParam("密码") @RequestParam("password") String password){
+    ,@ApiParam("密码") @RequestParam("password") String password,@ApiParam("结算周期  1(7天) 2(15天) 3(30天)") @RequestParam(name="cycleType",required = false) Integer cycleType,
+    @ApiParam("结算方式  1(指定账期1 ) 2( 指定账期2 ) 3(指定账期3)") @RequestParam(name="payType",required = false) Integer payType
+    ,@ApiParam("个性签名(说明)") @RequestParam(name="personalizedSignature",required = false) String personalizedSignature,
+     @ApiParam("邮箱") @RequestParam(name="email",required = false) String email){
         UmsMember umsMember = new UmsMember();
         umsMember.setPhone(phone);
         umsMember.setUsername(username);
         umsMember.setName(name);
         umsMember.setAccouuntType(accouuntType);
         umsMember.setPassword(password);
+        umsMember.setCycleType(cycleType);
+        umsMember.setPayType(payType);
+        umsMember.setPersonalizedSignature(personalizedSignature);
+        umsMember.setEmail(email);
         ResultMsg res = this.memberService.insertMember(umsMember);
         if(res.isFlag()){
             return CommonResult.success(null,res.getMsg());

mall-admin/src/main/java/com/macro/mall/service/impl/ProductAttributeGroupServiceImpl.java

@@ -33,7 +33,7 @@ public class ProductAttributeGroupServiceImpl implements ProductAttributeGroupSe
         PageHelper.startPage(pageNum, pageSize);
         Map<String,Object> map = new HashMap<>();
         map.put("cid",cid);
-        map.put("attributeCategoryId",pmsProductAttributeCategoryService.getAtributeCategoryIdList(attributeCategoryId));
+        map.put("attributeCategoryIdList",pmsProductAttributeCategoryService.getAtributeCategoryIdList(attributeCategoryId));
         return pmsProductAttributeGroupDao.getList(map);
     }
 

mall-mbg/src/main/java/com/macro/mall/model/PmsProduct.java

@@ -169,6 +169,15 @@ public class PmsProduct implements Serializable {
     @ApiModelProperty(value = "商品参考库存")
     private Integer stock;
 
+    @ApiModelProperty(value = "备注")
+    private String remarks;
+
+    @ApiModelProperty(value = "规格说明")
+    private String reason;
+
+    @ApiModelProperty(value = "日发货量")
+    private String deliveryNum;
+
     @ApiModelProperty(value = "商品描述")
     private String description;
 
@@ -593,6 +602,30 @@ public class PmsProduct implements Serializable {
         this.stock = stock;
     }
 
+    public String getRemarks() {
+        return remarks;
+    }
+
+    public void setRemarks(String remarks) {
+        this.remarks = remarks;
+    }
+
+    public String getReason() {
+        return reason;
+    }
+
+    public void setReason(String reason) {
+        this.reason = reason;
+    }
+
+    public String getDeliveryNum() {
+        return deliveryNum;
+    }
+
+    public void setDeliveryNum(String deliveryNum) {
+        this.deliveryNum = deliveryNum;
+    }
+
     public String getDescription() {
         return description;
     }
@@ -667,6 +700,9 @@ public class PmsProduct implements Serializable {
         sb.append(", contSign=").append(contSign);
         sb.append(", commission=").append(commission);
         sb.append(", stock=").append(stock);
+        sb.append(", remarks=").append(remarks);
+        sb.append(", reason=").append(reason);
+        sb.append(", deliveryNum=").append(deliveryNum);
         sb.append(", description=").append(description);
         sb.append(", detailHtml=").append(detailHtml);
         sb.append(", serialVersionUID=").append(serialVersionUID);

mall-mbg/src/main/java/com/macro/mall/model/PmsProductExample.java

@@ -3375,6 +3375,216 @@ public class PmsProductExample {
             addCriterion("stock not between", value1, value2, "stock");
             return (Criteria) this;
         }
+
+        public Criteria andRemarksIsNull() {
+            addCriterion("remarks is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarksIsNotNull() {
+            addCriterion("remarks is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarksEqualTo(String value) {
+            addCriterion("remarks =", value, "remarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarksNotEqualTo(String value) {
+            addCriterion("remarks <>", value, "remarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarksGreaterThan(String value) {
+            addCriterion("remarks >", value, "remarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarksGreaterThanOrEqualTo(String value) {
+            addCriterion("remarks >=", value, "remarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarksLessThan(String value) {
+            addCriterion("remarks <", value, "remarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarksLessThanOrEqualTo(String value) {
+            addCriterion("remarks <=", value, "remarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarksLike(String value) {
+            addCriterion("remarks like", value, "remarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarksNotLike(String value) {
+            addCriterion("remarks not like", value, "remarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarksIn(List<String> values) {
+            addCriterion("remarks in", values, "remarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarksNotIn(List<String> values) {
+            addCriterion("remarks not in", values, "remarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarksBetween(String value1, String value2) {
+            addCriterion("remarks between", value1, value2, "remarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andRemarksNotBetween(String value1, String value2) {
+            addCriterion("remarks not between", value1, value2, "remarks");
+            return (Criteria) this;
+        }
+
+        public Criteria andReasonIsNull() {
+            addCriterion("reason is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andReasonIsNotNull() {
+            addCriterion("reason is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andReasonEqualTo(String value) {
+            addCriterion("reason =", value, "reason");
+            return (Criteria) this;
+        }
+
+        public Criteria andReasonNotEqualTo(String value) {
+            addCriterion("reason <>", value, "reason");
+            return (Criteria) this;
+        }
+
+        public Criteria andReasonGreaterThan(String value) {
+            addCriterion("reason >", value, "reason");
+            return (Criteria) this;
+        }
+
+        public Criteria andReasonGreaterThanOrEqualTo(String value) {
+            addCriterion("reason >=", value, "reason");
+            return (Criteria) this;
+        }
+
+        public Criteria andReasonLessThan(String value) {
+            addCriterion("reason <", value, "reason");
+            return (Criteria) this;
+        }
+
+        public Criteria andReasonLessThanOrEqualTo(String value) {
+            addCriterion("reason <=", value, "reason");
+            return (Criteria) this;
+        }
+
+        public Criteria andReasonLike(String value) {
+            addCriterion("reason like", value, "reason");
+            return (Criteria) this;
+        }
+
+        public Criteria andReasonNotLike(String value) {
+            addCriterion("reason not like", value, "reason");
+            return (Criteria) this;
+        }
+
+        public Criteria andReasonIn(List<String> values) {
+            addCriterion("reason in", values, "reason");
+            return (Criteria) this;
+        }
+
+        public Criteria andReasonNotIn(List<String> values) {
+            addCriterion("reason not in", values, "reason");
+            return (Criteria) this;
+        }
+
+        public Criteria andReasonBetween(String value1, String value2) {
+            addCriterion("reason between", value1, value2, "reason");
+            return (Criteria) this;
+        }
+
+        public Criteria andReasonNotBetween(String value1, String value2) {
+            addCriterion("reason not between", value1, value2, "reason");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliveryNumIsNull() {
+            addCriterion("delivery_num is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliveryNumIsNotNull() {
+            addCriterion("delivery_num is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliveryNumEqualTo(String value) {
+            addCriterion("delivery_num =", value, "deliveryNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliveryNumNotEqualTo(String value) {
+            addCriterion("delivery_num <>", value, "deliveryNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliveryNumGreaterThan(String value) {
+            addCriterion("delivery_num >", value, "deliveryNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliveryNumGreaterThanOrEqualTo(String value) {
+            addCriterion("delivery_num >=", value, "deliveryNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliveryNumLessThan(String value) {
+            addCriterion("delivery_num <", value, "deliveryNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliveryNumLessThanOrEqualTo(String value) {
+            addCriterion("delivery_num <=", value, "deliveryNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliveryNumLike(String value) {
+            addCriterion("delivery_num like", value, "deliveryNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliveryNumNotLike(String value) {
+            addCriterion("delivery_num not like", value, "deliveryNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliveryNumIn(List<String> values) {
+            addCriterion("delivery_num in", values, "deliveryNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliveryNumNotIn(List<String> values) {
+            addCriterion("delivery_num not in", values, "deliveryNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliveryNumBetween(String value1, String value2) {
+            addCriterion("delivery_num between", value1, value2, "deliveryNum");
+            return (Criteria) this;
+        }
+
+        public Criteria andDeliveryNumNotBetween(String value1, String value2) {
+            addCriterion("delivery_num not between", value1, value2, "deliveryNum");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

mall-mbg/src/main/java/com/macro/mall/model/UmsMember.java

@@ -45,7 +45,7 @@ public class UmsMember implements Serializable {
     @ApiModelProperty(value = "职业")
     private String job;
 
-    @ApiModelProperty(value = "个性签名(说明)")
+    @ApiModelProperty(value = "个性签名")
     private String personalizedSignature;
 
     @ApiModelProperty(value = "用户来源")
@@ -131,6 +131,12 @@ public class UmsMember implements Serializable {
     @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private Date loginTime;
 
+    @ApiModelProperty(value = "结算方式  1(指定账期1 ) 2( 指定账期2 ) 3(指定账期3)")
+    private Integer payType;
+
+    @ApiModelProperty(value = "结算周期  1(7天) 2(15天) 3(30天)")
+    private Integer cycleType;
+
     private static final long serialVersionUID = 1L;
 
     public Long getId() {
@@ -445,6 +451,22 @@ public class UmsMember implements Serializable {
         this.loginTime = loginTime;
     }
 
+    public Integer getPayType() {
+        return payType;
+    }
+
+    public void setPayType(Integer payType) {
+        this.payType = payType;
+    }
+
+    public Integer getCycleType() {
+        return cycleType;
+    }
+
+    public void setCycleType(Integer cycleType) {
+        this.cycleType = cycleType;
+    }
+
     @Override
     public String toString() {
         StringBuilder sb = new StringBuilder();
@@ -490,6 +512,8 @@ public class UmsMember implements Serializable {
         sb.append(", distributionLevel=").append(distributionLevel);
         sb.append(", accouuntType=").append(accouuntType);
         sb.append(", loginTime=").append(loginTime);
+        sb.append(", payType=").append(payType);
+        sb.append(", cycleType=").append(cycleType);
         sb.append(", serialVersionUID=").append(serialVersionUID);
         sb.append("]");
         return sb.toString();

mall-mbg/src/main/java/com/macro/mall/model/UmsMemberExample.java

@@ -2651,6 +2651,126 @@ public class UmsMemberExample {
             addCriterion("login_time not between", value1, value2, "loginTime");
             return (Criteria) this;
         }
+
+        public Criteria andPayTypeIsNull() {
+            addCriterion("pay_type is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayTypeIsNotNull() {
+            addCriterion("pay_type is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayTypeEqualTo(Integer value) {
+            addCriterion("pay_type =", value, "payType");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayTypeNotEqualTo(Integer value) {
+            addCriterion("pay_type <>", value, "payType");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayTypeGreaterThan(Integer value) {
+            addCriterion("pay_type >", value, "payType");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayTypeGreaterThanOrEqualTo(Integer value) {
+            addCriterion("pay_type >=", value, "payType");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayTypeLessThan(Integer value) {
+            addCriterion("pay_type <", value, "payType");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayTypeLessThanOrEqualTo(Integer value) {
+            addCriterion("pay_type <=", value, "payType");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayTypeIn(List<Integer> values) {
+            addCriterion("pay_type in", values, "payType");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayTypeNotIn(List<Integer> values) {
+            addCriterion("pay_type not in", values, "payType");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayTypeBetween(Integer value1, Integer value2) {
+            addCriterion("pay_type between", value1, value2, "payType");
+            return (Criteria) this;
+        }
+
+        public Criteria andPayTypeNotBetween(Integer value1, Integer value2) {
+            addCriterion("pay_type not between", value1, value2, "payType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCycleTypeIsNull() {
+            addCriterion("cycle_type is null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCycleTypeIsNotNull() {
+            addCriterion("cycle_type is not null");
+            return (Criteria) this;
+        }
+
+        public Criteria andCycleTypeEqualTo(Integer value) {
+            addCriterion("cycle_type =", value, "cycleType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCycleTypeNotEqualTo(Integer value) {
+            addCriterion("cycle_type <>", value, "cycleType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCycleTypeGreaterThan(Integer value) {
+            addCriterion("cycle_type >", value, "cycleType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCycleTypeGreaterThanOrEqualTo(Integer value) {
+            addCriterion("cycle_type >=", value, "cycleType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCycleTypeLessThan(Integer value) {
+            addCriterion("cycle_type <", value, "cycleType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCycleTypeLessThanOrEqualTo(Integer value) {
+            addCriterion("cycle_type <=", value, "cycleType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCycleTypeIn(List<Integer> values) {
+            addCriterion("cycle_type in", values, "cycleType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCycleTypeNotIn(List<Integer> values) {
+            addCriterion("cycle_type not in", values, "cycleType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCycleTypeBetween(Integer value1, Integer value2) {
+            addCriterion("cycle_type between", value1, value2, "cycleType");
+            return (Criteria) this;
+        }
+
+        public Criteria andCycleTypeNotBetween(Integer value1, Integer value2) {
+            addCriterion("cycle_type not between", value1, value2, "cycleType");
+            return (Criteria) this;
+        }
     }
 
     public static class Criteria extends GeneratedCriteria {

mall-mbg/src/main/resources/com/macro/mall/mapper/PmsProductMapper.xml

@@ -54,6 +54,9 @@
     <result column="cont_sign" jdbcType="VARCHAR" property="contSign" />
     <result column="commission" jdbcType="DECIMAL" property="commission" />
     <result column="stock" jdbcType="INTEGER" property="stock" />
+    <result column="remarks" jdbcType="VARCHAR" property="remarks" />
+    <result column="reason" jdbcType="VARCHAR" property="reason" />
+    <result column="delivery_num" jdbcType="VARCHAR" property="deliveryNum" />
   </resultMap>
   <resultMap extends="BaseResultMap" id="ResultMapWithBLOBs" type="com.macro.mall.model.PmsProduct">
     <result column="description" jdbcType="LONGVARCHAR" property="description" />
@@ -125,7 +128,8 @@
     delivery_area, is_time_up, timer_date, market_date, product_origin, cost_price, bar_code, 
     virtual_sales, product_pic, pic_type, product_video, note, promotion_type, gift_growth, 
     gift_point, use_point_limit, spu_id, third_flag, create_date, create_by, update_date, 
-    update_by, delete_status, delivery_type, cont_sign, commission, stock
+    update_by, delete_status, delivery_type, cont_sign, commission, stock, remarks, reason, 
+    delivery_num
   </sql>
   <sql id="Blob_Column_List">
     description, detail_html
@@ -199,7 +203,8 @@
       spu_id, third_flag, create_date, 
       create_by, update_date, update_by, 
       delete_status, delivery_type, cont_sign, 
-      commission, stock, description, 
+      commission, stock, remarks, 
+      reason, delivery_num, description, 
       detail_html)
     values (#{name,jdbcType=VARCHAR}, #{mchtId,jdbcType=BIGINT}, #{publishStatus,jdbcType=INTEGER}, 
       #{publishDate,jdbcType=TIMESTAMP}, #{verifyStatus,jdbcType=INTEGER}, #{newStatus,jdbcType=INTEGER}, 
@@ -218,7 +223,8 @@
       #{spuId,jdbcType=VARCHAR}, #{thirdFlag,jdbcType=INTEGER}, #{createDate,jdbcType=TIMESTAMP}, 
       #{createBy,jdbcType=BIGINT}, #{updateDate,jdbcType=TIMESTAMP}, #{updateBy,jdbcType=BIGINT}, 
       #{deleteStatus,jdbcType=INTEGER}, #{deliveryType,jdbcType=INTEGER}, #{contSign,jdbcType=VARCHAR}, 
-      #{commission,jdbcType=DECIMAL}, #{stock,jdbcType=INTEGER}, #{description,jdbcType=LONGVARCHAR}, 
+      #{commission,jdbcType=DECIMAL}, #{stock,jdbcType=INTEGER}, #{remarks,jdbcType=VARCHAR}, 
+      #{reason,jdbcType=VARCHAR}, #{deliveryNum,jdbcType=VARCHAR}, #{description,jdbcType=LONGVARCHAR}, 
       #{detailHtml,jdbcType=LONGVARCHAR})
   </insert>
   <insert id="insertSelective" parameterType="com.macro.mall.model.PmsProduct">
@@ -380,6 +386,15 @@
       <if test="stock != null">
         stock,
       </if>
+      <if test="remarks != null">
+        remarks,
+      </if>
+      <if test="reason != null">
+        reason,
+      </if>
+      <if test="deliveryNum != null">
+        delivery_num,
+      </if>
       <if test="description != null">
         description,
       </if>
@@ -541,6 +556,15 @@
       <if test="stock != null">
         #{stock,jdbcType=INTEGER},
       </if>
+      <if test="remarks != null">
+        #{remarks,jdbcType=VARCHAR},
+      </if>
+      <if test="reason != null">
+        #{reason,jdbcType=VARCHAR},
+      </if>
+      <if test="deliveryNum != null">
+        #{deliveryNum,jdbcType=VARCHAR},
+      </if>
       <if test="description != null">
         #{description,jdbcType=LONGVARCHAR},
       </if>
@@ -714,6 +738,15 @@
       <if test="record.stock != null">
         stock = #{record.stock,jdbcType=INTEGER},
       </if>
+      <if test="record.remarks != null">
+        remarks = #{record.remarks,jdbcType=VARCHAR},
+      </if>
+      <if test="record.reason != null">
+        reason = #{record.reason,jdbcType=VARCHAR},
+      </if>
+      <if test="record.deliveryNum != null">
+        delivery_num = #{record.deliveryNum,jdbcType=VARCHAR},
+      </if>
       <if test="record.description != null">
         description = #{record.description,jdbcType=LONGVARCHAR},
       </if>
@@ -779,6 +812,9 @@
       cont_sign = #{record.contSign,jdbcType=VARCHAR},
       commission = #{record.commission,jdbcType=DECIMAL},
       stock = #{record.stock,jdbcType=INTEGER},
+      remarks = #{record.remarks,jdbcType=VARCHAR},
+      reason = #{record.reason,jdbcType=VARCHAR},
+      delivery_num = #{record.deliveryNum,jdbcType=VARCHAR},
       description = #{record.description,jdbcType=LONGVARCHAR},
       detail_html = #{record.detailHtml,jdbcType=LONGVARCHAR}
     <if test="_parameter != null">
@@ -838,7 +874,10 @@
       delivery_type = #{record.deliveryType,jdbcType=INTEGER},
       cont_sign = #{record.contSign,jdbcType=VARCHAR},
       commission = #{record.commission,jdbcType=DECIMAL},
-      stock = #{record.stock,jdbcType=INTEGER}
+      stock = #{record.stock,jdbcType=INTEGER},
+      remarks = #{record.remarks,jdbcType=VARCHAR},
+      reason = #{record.reason,jdbcType=VARCHAR},
+      delivery_num = #{record.deliveryNum,jdbcType=VARCHAR}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -999,6 +1038,15 @@
       <if test="stock != null">
         stock = #{stock,jdbcType=INTEGER},
       </if>
+      <if test="remarks != null">
+        remarks = #{remarks,jdbcType=VARCHAR},
+      </if>
+      <if test="reason != null">
+        reason = #{reason,jdbcType=VARCHAR},
+      </if>
+      <if test="deliveryNum != null">
+        delivery_num = #{deliveryNum,jdbcType=VARCHAR},
+      </if>
       <if test="description != null">
         description = #{description,jdbcType=LONGVARCHAR},
       </if>
@@ -1061,6 +1109,9 @@
       cont_sign = #{contSign,jdbcType=VARCHAR},
       commission = #{commission,jdbcType=DECIMAL},
       stock = #{stock,jdbcType=INTEGER},
+      remarks = #{remarks,jdbcType=VARCHAR},
+      reason = #{reason,jdbcType=VARCHAR},
+      delivery_num = #{deliveryNum,jdbcType=VARCHAR},
       description = #{description,jdbcType=LONGVARCHAR},
       detail_html = #{detailHtml,jdbcType=LONGVARCHAR}
     where id = #{id,jdbcType=BIGINT}
@@ -1117,7 +1168,10 @@
       delivery_type = #{deliveryType,jdbcType=INTEGER},
       cont_sign = #{contSign,jdbcType=VARCHAR},
       commission = #{commission,jdbcType=DECIMAL},
-      stock = #{stock,jdbcType=INTEGER}
+      stock = #{stock,jdbcType=INTEGER},
+      remarks = #{remarks,jdbcType=VARCHAR},
+      reason = #{reason,jdbcType=VARCHAR},
+      delivery_num = #{deliveryNum,jdbcType=VARCHAR}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>
\ No newline at end of file

mall-mbg/src/main/resources/com/macro/mall/mapper/UmsMemberMapper.xml

@@ -41,6 +41,8 @@
     <result column="distribution_level" jdbcType="INTEGER" property="distributionLevel" />
     <result column="accouunt_type" jdbcType="INTEGER" property="accouuntType" />
     <result column="login_time" jdbcType="TIMESTAMP" property="loginTime" />
+    <result column="pay_type" jdbcType="INTEGER" property="payType" />
+    <result column="cycle_type" jdbcType="INTEGER" property="cycleType" />
   </resultMap>
   <sql id="Example_Where_Clause">
     <where>
@@ -106,7 +108,8 @@
     create_by, update_date, update_by, delete_status, name, create_time, luckey_count, 
     history_integration, email, identity_number, identity_photo_a, identity_photo_b, 
     identity_review_opinion, identity_review_status, identity_review_time, invitation_code, 
-    invitation_code_id, union_id, label, distribution_level, accouunt_type, login_time
+    invitation_code_id, union_id, label, distribution_level, accouunt_type, login_time, 
+    pay_type, cycle_type
   </sql>
   <select id="selectByExample" parameterType="com.macro.mall.model.UmsMemberExample" resultMap="BaseResultMap">
     select
@@ -155,7 +158,8 @@
       identity_review_status, identity_review_time, 
       invitation_code, invitation_code_id, union_id, 
       label, distribution_level, accouunt_type, 
-      login_time)
+      login_time, pay_type, cycle_type
+      )
     values (#{memberLevelId,jdbcType=BIGINT}, #{username,jdbcType=VARCHAR}, #{password,jdbcType=VARCHAR}, 
       #{nickname,jdbcType=VARCHAR}, #{phone,jdbcType=VARCHAR}, #{status,jdbcType=INTEGER}, 
       #{icon,jdbcType=VARCHAR}, #{gender,jdbcType=INTEGER}, #{birthday,jdbcType=DATE}, 
@@ -169,7 +173,8 @@
       #{identityReviewStatus,jdbcType=VARCHAR}, #{identityReviewTime,jdbcType=TIMESTAMP}, 
       #{invitationCode,jdbcType=VARCHAR}, #{invitationCodeId,jdbcType=BIGINT}, #{unionId,jdbcType=VARCHAR}, 
       #{label,jdbcType=VARCHAR}, #{distributionLevel,jdbcType=INTEGER}, #{accouuntType,jdbcType=INTEGER}, 
-      #{loginTime,jdbcType=TIMESTAMP})
+      #{loginTime,jdbcType=TIMESTAMP}, #{payType,jdbcType=INTEGER}, #{cycleType,jdbcType=INTEGER}
+      )
   </insert>
   <insert id="insertSelective" parameterType="com.macro.mall.model.UmsMember">
     <selectKey keyProperty="id" order="AFTER" resultType="java.lang.Long">
@@ -291,6 +296,12 @@
       <if test="loginTime != null">
         login_time,
       </if>
+      <if test="payType != null">
+        pay_type,
+      </if>
+      <if test="cycleType != null">
+        cycle_type,
+      </if>
     </trim>
     <trim prefix="values (" suffix=")" suffixOverrides=",">
       <if test="memberLevelId != null">
@@ -407,6 +418,12 @@
       <if test="loginTime != null">
         #{loginTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="payType != null">
+        #{payType,jdbcType=INTEGER},
+      </if>
+      <if test="cycleType != null">
+        #{cycleType,jdbcType=INTEGER},
+      </if>
     </trim>
   </insert>
   <select id="countByExample" parameterType="com.macro.mall.model.UmsMemberExample" resultType="java.lang.Long">
@@ -535,6 +552,12 @@
       <if test="record.loginTime != null">
         login_time = #{record.loginTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="record.payType != null">
+        pay_type = #{record.payType,jdbcType=INTEGER},
+      </if>
+      <if test="record.cycleType != null">
+        cycle_type = #{record.cycleType,jdbcType=INTEGER},
+      </if>
     </set>
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
@@ -580,7 +603,9 @@
       label = #{record.label,jdbcType=VARCHAR},
       distribution_level = #{record.distributionLevel,jdbcType=INTEGER},
       accouunt_type = #{record.accouuntType,jdbcType=INTEGER},
-      login_time = #{record.loginTime,jdbcType=TIMESTAMP}
+      login_time = #{record.loginTime,jdbcType=TIMESTAMP},
+      pay_type = #{record.payType,jdbcType=INTEGER},
+      cycle_type = #{record.cycleType,jdbcType=INTEGER}
     <if test="_parameter != null">
       <include refid="Update_By_Example_Where_Clause" />
     </if>
@@ -702,6 +727,12 @@
       <if test="loginTime != null">
         login_time = #{loginTime,jdbcType=TIMESTAMP},
       </if>
+      <if test="payType != null">
+        pay_type = #{payType,jdbcType=INTEGER},
+      </if>
+      <if test="cycleType != null">
+        cycle_type = #{cycleType,jdbcType=INTEGER},
+      </if>
     </set>
     where id = #{id,jdbcType=BIGINT}
   </update>
@@ -744,7 +775,9 @@
       label = #{label,jdbcType=VARCHAR},
       distribution_level = #{distributionLevel,jdbcType=INTEGER},
       accouunt_type = #{accouuntType,jdbcType=INTEGER},
-      login_time = #{loginTime,jdbcType=TIMESTAMP}
+      login_time = #{loginTime,jdbcType=TIMESTAMP},
+      pay_type = #{payType,jdbcType=INTEGER},
+      cycle_type = #{cycleType,jdbcType=INTEGER}
     where id = #{id,jdbcType=BIGINT}
   </update>
 </mapper>
\ No newline at end of file

mall-portal/src/main/resources/application.yml

@@ -90,6 +90,7 @@ secure:
       - /article/detail
       - /api/y/member/readHistory/list
       - /activities/**
+      - /aliyun/oss
 # 自定义redis键值
 redis:
   key: