Merge remote-tracking branch 'origin/base-modify' into base-modify

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/BaseUserMemberLevel.java

@@ -42,7 +42,7 @@ public class BaseUserMemberLevel implements Serializable {
     private Integer level;
 	
 	    //描述
-    @Column(name = "describe")
+    @Column(name = "describes")
 	@ApiModelProperty(value = "描述")
     private String describe;
 	

ace-modules/ace-generator/src/main/resources/template/entity.java.vm

@@ -24,13 +24,17 @@ public class ${className} implements Serializable {
 	
 #foreach ($column in $columns)
 	#if($column.columnName == $pk.columnName)
-    //$column.comments
+    /**
+    *  $column.comments
+   */
     @Id
 	@GeneratedValue(generator = "JDBC")
 	@ApiModelProperty("$column.comments")
     private $column.attrType $column.attrname;
 	#else
-    //$column.comments
+    /**
+     *  $column.comments
+     */
     @Column(name = "$column.columnName")
 	@ApiModelProperty(value = "$column.comments"#if($column.columnName == "crt_time"||$column.columnName == "upd_time"), hidden = true #end)
     private $column.attrType $column.attrname;

xx-app/xx-app-api/src/main/java/com/xxfc/platform/app/entity/Cofig.java

 package com.xxfc.platform.app.entity;
 
 import java.io.Serializable;
-import java.util.Date;
 import javax.persistence.*;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
@@ -15,40 +14,55 @@ import lombok.Data;
  * @date 2019-06-03 15:57:13
  */
 @Data
-@Table(name = "cofig")
+@Table(name = "config")
 public class Cofig implements Serializable {
 	private static final long serialVersionUID = 1L;
 
-	    //主键id
+	/**
+	 * 主键id
+	 */
 	@Id
 	@GeneratedValue(generator = "JDBC")
 	@ApiModelProperty("主键id")
     private Integer id;
 
-	    //1-租车须知；2-预定须知
+	/**
+	 * 1-租车须知；2-预定须知
+	 */
     @Column(name = "type")
-	@ApiModelProperty(value = "1-租车须知；2-预定须知")
+	@ApiModelProperty(value = "1-租车须知；2-预定须知;3-旅游")
     private Integer type;
 
-	    //
+	/**
+	 *
+	 */
 	@Column(name = "value")
 	@ApiModelProperty(value = "")
     private String value;
 
-	    //创建时间
+	/**
+	 * 创建时间
+	 */
 	@Column(name = "crt_time")
 	@ApiModelProperty(value = "创建时间", hidden = true )
     private Long crtTime;
 
-	    //更新时间
+	/**
+	 * 更新时间
+	 */
 	@Column(name = "upd_time")
 	@ApiModelProperty(value = "更新时间", hidden = true )
     private Long updTime;
 
-	    //是否删除；0-1正常；1-删除
+	/**
+	 * 是否删除；0-1正常；1-删除
+	 */
     @Column(name = "is_del")
 	@ApiModelProperty(value = "是否删除；0-1正常；1-删除")
     private Integer isDel;
 
+    @Column(name = "title")
+	@ApiModelProperty(value = "标题")
+    private String title;
 
 }

xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/biz/CofigBiz.java

@@ -22,5 +22,4 @@ public class CofigBiz extends BaseBiz<CofigMapper,Cofig> {
         return  mapper.getAllByType(list);
 
     }
-
 }
\ No newline at end of file

xx-app/xx-app-server/src/main/java/com/xxfc/platform/app/rest/admin/CofigAdminController.java

+package com.xxfc.platform.app.rest.admin;
+
+import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.xxfc.platform.app.biz.CofigBiz;
+import com.xxfc.platform.app.entity.Cofig;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+/**
+ * @author libin
+ * @version 1.0
+ * @description  后台*通用配置
+ * @data 2019/6/12 9:56
+ */
+@RestController
+@RequestMapping("/admin/config")
+@Slf4j
+public class CofigAdminController extends BaseController<CofigBiz,Cofig> {
+
+
+}
\ No newline at end of file

xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/entity/TourGoodSite.java

@@ -106,9 +106,9 @@ public class TourGoodSite implements Serializable {
     private Integer status;
 	
 	    //创建时间
-    @Column(name = "ctr_time")
+    @Column(name = "crt_time")
 	@ApiModelProperty(value = "创建时间")
-    private Long ctrTime;
+    private Long crtTime;
 	
 	    //更新时间
     @Column(name = "upd_time")

xx-tour/xx-tour-server/src/main/java/com/xxfc/platform/tour/biz/TourGoodDetailBiz.java

 package com.xxfc.platform.tour.biz;
 
+import com.github.wxiaoqi.security.admin.entity.BaseUserMemberLevel;
+import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.xxfc.platform.tour.entity.TourGood;
@@ -39,6 +41,8 @@ public class TourGoodDetailBiz extends BaseBiz<TourGoodMapper, TourGood> {
     TourGoodSpePriceMapper priceMapper;
     @Autowired
     TourGoodSiteMapper siteMapper;
+    @Autowired
+    private UserFeign userFeign;
 
     //获取商品详情
     public ObjectRestResponse<TourGoodDetailVo> getGoodDetaileById(Integer id){
@@ -53,16 +57,21 @@ public class TourGoodDetailBiz extends BaseBiz<TourGoodMapper, TourGood> {
                 BigDecimal price=detailVo.getPrice();
                 if(price!=null&&detailVo.getIsMember()>0){
                     List<TourMemberVo> memberList=new ArrayList<>();
-                    for(int i=1;i<4;i++){
+                    List<BaseUserMemberLevel> levelsList=userFeign.levels();
+                    if(levelsList.size()>0){
+                        for(BaseUserMemberLevel memberLevel :levelsList){
                             TourMemberVo memberVo=new TourMemberVo();
-                        memberVo.setLevel(i);
-                        memberVo.setName(getName(i));
-                        BigDecimal member_price=price.multiply(new BigDecimal("0.88")).setScale(2, RoundingMode.HALF_UP);  ;
+                            memberVo.setLevel(memberLevel.getLevel());
+                            memberVo.setName(memberLevel.getName());
+                            BigDecimal member_price=price.multiply(new BigDecimal(memberLevel.getDiscount()+"")).divide(new BigDecimal("100"))
+                                    .setScale(2, RoundingMode.HALF_UP);  ;
                             memberVo.setPrice(member_price);
                             memberList.add(memberVo);
                         }
                         detailVo.setMemberVo(memberList);
                     }
+
+                }
                 //获取出行时间
 
                 List<TourDepartTimeVo> timelist=priceMapper.getAllByGoodId(id);
@@ -80,23 +89,6 @@ public class TourGoodDetailBiz extends BaseBiz<TourGoodMapper, TourGood> {
         }
     }
     
-    public String  getName(Integer type){
-        String name="";
-        switch (type){
-            case 1:
-                name="普通会员";
-                break;
-            case 2:
-                name="黄金会员";
-                break;
-            case 3:
-                name="钻石会员";
-                break;
-
-
-        }
-         return  name;
-    }
 
 
 

xx-tour/xx-tour-server/src/main/resources/mapper/TourGoodSiteMapper.xml

@@ -15,7 +15,7 @@
         <result property="type" column="type"/>
         <result property="rank" column="rank"/>
         <result property="status" column="status"/>
-        <result property="ctrTime" column="ctr_time"/>
+        <result property="crtTime" column="crt_time"/>
         <result property="updTime" column="upd_time"/>
         <result property="intro" column="intro"/>
         <result property="isDel" column="is_del"/>