modified table name and createtime

rankin-cms-web/src/main/java/cn/rankin/cmsweb/controller/resource/AliOSSController.java

@@ -2,7 +2,7 @@ package cn.rankin.cmsweb.controller.resource;
 
 import cn.rankin.cmsweb.service.resource.ResourceService;
 import cn.rankin.common.utils.api.model.APIResult;
-import cn.rankin.data.api.resource.OSSSignatureVo;
+import cn.rankin.data.api.resource.vo.OSSSignature;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
@@ -16,7 +16,7 @@ public class AliOSSController {
     private ResourceService resourceService;
 
     @RequestMapping(value = "/oss/signature", method = RequestMethod.GET)
-    public APIResult<OSSSignatureVo> getSign(@RequestParam("fileName") String fileName) {
+    public APIResult<OSSSignature> getSign(@RequestParam("fileName") String fileName) {
         return resourceService.getSign(fileName);
     }
 }

rankin-cms-web/src/main/java/cn/rankin/cmsweb/service/resource/ResourceService.java

@@ -4,7 +4,7 @@ import cn.rankin.common.utils.api.model.APIResult;
 import cn.rankin.common.utils.api.page.Page;
 import cn.rankin.common.utils.dto.resource.ResourceDTO;
 import cn.rankin.common.utils.vo.resource.ResourceVo;
-import cn.rankin.data.api.resource.OSSSignatureVo;
+import cn.rankin.data.api.resource.vo.OSSSignature;
 import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
@@ -27,5 +27,5 @@ public interface ResourceService {
     APIResult<Map<String, ResourceVo>> getBatch(@RequestParam("id") List<String> ids);
 
     @RequestMapping(value = "/oss/signature", method = RequestMethod.GET)
-    APIResult<OSSSignatureVo> getSign(@RequestParam("fileName") String fileName);
+    APIResult<OSSSignature> getSign(@RequestParam("fileName") String fileName);
 }

rankin-cms-web/src/main/java/cn/rankin/cmsweb/service/trade/order/OrderService.java

@@ -9,7 +9,6 @@ import cn.rankin.common.utils.api.model.APIResult;
 import cn.rankin.common.utils.api.model.BaseCode;
 import cn.rankin.common.utils.api.page.Page;
 import cn.rankin.common.utils.enums.LedgerTypeEnum;
-import cn.rankin.common.utils.enums.OrderStatusEnum;
 import cn.rankin.common.utils.enums.ProductTypeEnum;
 import cn.rankin.common.utils.util.BeanUtil;
 import cn.rankin.data.api.cms.OrderSearchWebDTO;
@@ -17,7 +16,7 @@ import cn.rankin.data.api.product.vo.GoodsVo;
 import cn.rankin.data.api.trade.dto.UserOrderDTO;
 import cn.rankin.data.api.trade.dto.OrderGoodsDTO;
 import cn.rankin.data.api.trade.entity.OrderGoods;
-import cn.rankin.data.api.trade.entity.UserOrder;
+import cn.rankin.data.api.trade.entity.Order;
 import cn.rankin.data.api.trade.vo.UserOrderVo;
 import cn.rankin.data.api.user.dto.CampusSearchDTO;
 import cn.rankin.data.api.user.dto.MerchantPayDTO;
@@ -57,14 +56,14 @@ public class OrderService {
     private MerchantService merchantService;
 
     public APIResult<Boolean> pay(String orderId) {
-        APIResult<UserOrder> userOrderAPIResult = orderServiceFeign.getOrder(orderId);
-        UserOrder userOrder = userOrderAPIResult.getData();
-        if (userOrder == null || !userOrderAPIResult.getSuccess()) {
+        APIResult<Order> userOrderAPIResult = orderServiceFeign.getOrder(orderId);
+        Order order = userOrderAPIResult.getData();
+        if (order == null || !userOrderAPIResult.getSuccess()) {
             log.error("查询订单错误, orderId={}, {}", orderId, userOrderAPIResult.getMessage());
             return APIResult.error(new BaseCode(userOrderAPIResult.getCode(), userOrderAPIResult.getMessage()));
         }
 
-        String uid = userOrder.getUid();
+        String uid = order.getUid();
         APIResult<TerminalUserVo> userVoAPIResult = terminalUserService.getUser(uid);
         TerminalUserVo userVo = userVoAPIResult.getData();
         if (!userVoAPIResult.getSuccess() || userVo == null) {
@@ -75,9 +74,9 @@ public class OrderService {
         // 开始扣款
         String merchantId = userVo.getMerchantId();
         MerchantPayDTO payDTO = new MerchantPayDTO();
-        payDTO.setQuantity(userOrder.getFinalPrice());
+        payDTO.setQuantity(order.getFinalPrice());
         payDTO.setType(LedgerTypeEnum.COURSE);
-        payDTO.setReceiptId(userOrder.getId());
+        payDTO.setReceiptId(order.getId());
 
         APIResult<Boolean> merchantPayAPIResult = merchantService.pay(merchantId, payDTO);
         if (!merchantPayAPIResult.getSuccess()) {
@@ -161,14 +160,14 @@ public class OrderService {
     }
 
     public APIResult<UserOrderVo> getOrder(String orderId) {
-        APIResult<UserOrder> userOrderVoAPIResult = orderServiceFeign.getOrder(orderId);
+        APIResult<Order> userOrderVoAPIResult = orderServiceFeign.getOrder(orderId);
         if (!userOrderVoAPIResult.getSuccess()) {
             return APIResult.error(new BaseCode(userOrderVoAPIResult.getCode(), userOrderVoAPIResult.getMessage()));
         }
 
-        UserOrder userOrder = userOrderVoAPIResult.getData();
-        UserOrderVo userOrderVo = convert(userOrder);
-        List<OrderGoods> orderGoodsList = userOrder.getGoods();
+        Order order = userOrderVoAPIResult.getData();
+        UserOrderVo userOrderVo = convert(order);
+        List<OrderGoods> orderGoodsList = order.getGoods();
         if (CollectionUtils.isEmpty(orderGoodsList)) {
             return APIResult.ok(userOrderVo);
         }
@@ -259,23 +258,23 @@ public class OrderService {
         searchParams.put("status", searchWebDTO.getStatus());
         searchParams.put("uid", uids);
 
-        APIResult<Page<UserOrder>> orderAPIResult = orderServiceFeign.search(searchParams);
+        APIResult<Page<Order>> orderAPIResult = orderServiceFeign.search(searchParams);
         if (!orderAPIResult.getSuccess()) {
             log.error("order query error: {}", orderAPIResult.getMessage());
             return APIResult.error(new BaseCode(orderAPIResult.getCode(), orderAPIResult.getMessage()));
         }
 
-        Page<UserOrder> userOrderPage = orderAPIResult.getData();
+        Page<Order> userOrderPage = orderAPIResult.getData();
         Page<UserOrderVo> page = new Page<>(userOrderPage.getTotalSize(), userOrderPage.getPageNo(), userOrderPage.getPageSize());
 
-        List<UserOrder> userOrderList = orderAPIResult.getData().getList();
+        List<Order> orderList = orderAPIResult.getData().getList();
         List<UserOrderVo> userOrderVoList = new ArrayList<>();
-        if (CollectionUtils.isEmpty(userOrderList)) {
+        if (CollectionUtils.isEmpty(orderList)) {
             return APIResult.ok(page);
         }
 
-        if (uids.isEmpty() && !CollectionUtils.isEmpty(userOrderList)) {
-            userOrderList.forEach(userOrderVo -> uids.add(userOrderVo.getUid()));
+        if (uids.isEmpty() && !CollectionUtils.isEmpty(orderList)) {
+            orderList.forEach(userOrderVo -> uids.add(userOrderVo.getUid()));
             APIResult<List<TerminalUserVo>> userAPIResult = terminalUserService.findByIds(uids);
             if (!userAPIResult.getSuccess()) {
                 return APIResult.error(new BaseCode(userAPIResult.getCode(), userAPIResult.getMessage()));
@@ -302,8 +301,8 @@ public class OrderService {
             }
         }
 
-        for (UserOrder userOrder : userOrderList) {
-            UserOrderVo userOrderVo = convert(userOrder);
+        for (Order order : orderList) {
+            UserOrderVo userOrderVo = convert(order);
             String uid = userOrderVo.getUid();
 
             TerminalUserVo terminalUserVo = userVoMap.get(uid);

rankin-cms-web/src/main/java/cn/rankin/cmsweb/service/trade/order/OrderServiceFeign.java

@@ -2,9 +2,8 @@ package cn.rankin.cmsweb.service.trade.order;
 
 import cn.rankin.common.utils.api.model.APIResult;
 import cn.rankin.common.utils.api.page.Page;
-import cn.rankin.common.utils.enums.OrderStatusEnum;
 import cn.rankin.data.api.trade.dto.UserOrderDTO;
-import cn.rankin.data.api.trade.entity.UserOrder;
+import cn.rankin.data.api.trade.entity.Order;
 import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.web.bind.annotation.*;
 
@@ -15,13 +14,13 @@ public interface OrderServiceFeign {
 
     // 此处返回值不用Vo，需要进一步处理
     @RequestMapping(value = "/order/list", method = RequestMethod.GET)
-    APIResult<Page<UserOrder>> search(@RequestParam Map<String, Object> searchDTO);
+    APIResult<Page<Order>> search(@RequestParam Map<String, Object> searchDTO);
 
     @RequestMapping(value = "/order", method = RequestMethod.POST)
-    APIResult<UserOrder> create(@RequestBody UserOrderDTO userOrderDTO);
+    APIResult<Order> create(@RequestBody UserOrderDTO userOrderDTO);
 
     @RequestMapping(value = "/order/{orderId}", method = RequestMethod.GET)
-    APIResult<UserOrder> getOrder(@PathVariable("orderId") String orderId);
+    APIResult<Order> getOrder(@PathVariable("orderId") String orderId);
 
     @RequestMapping(value = "/order/pay/{orderId}", method = RequestMethod.POST)
     APIResult<Boolean> pay(@PathVariable("orderId") String orderId);

rankin-cms-web/src/main/java/cn/rankin/cmsweb/utils/DTOConverter.java

@@ -1,14 +1,14 @@
 package cn.rankin.cmsweb.utils;
 
-import cn.rankin.data.api.trade.entity.UserOrder;
+import cn.rankin.data.api.trade.entity.Order;
 import cn.rankin.data.api.trade.vo.UserOrderVo;
 import org.springframework.beans.BeanUtils;
 
 public class DTOConverter {
 
-    public static UserOrderVo convert(UserOrder userOrder) {
+    public static UserOrderVo convert(Order order) {
         UserOrderVo userOrderVo = new UserOrderVo();
-        BeanUtils.copyProperties(userOrder, userOrderVo);
+        BeanUtils.copyProperties(order, userOrderVo);
         return userOrderVo;
     }
 

rankin-resource-service/src/main/java/cn/rankin/resourceservice/entity/ResourceType.java

@@ -1,4 +1,4 @@
-package cn.rankin.resourceservice.entity;
+package cn.rankin.common.utils.enums;
 
 public class ResourceType {
 

rankin-data-api/src/main/java/cn/rankin/data/api/product/entity/Course.java

@@ -16,7 +16,7 @@ import java.util.List;
 @Data
 @ToString
 @Entity
-@Table(name = "course", indexes = {@Index(columnList = "code"), @Index(columnList = "name")})
+@Table(name = "p_course", indexes = {@Index(columnList = "code"), @Index(columnList = "name")})
 @DynamicInsert
 @DynamicUpdate
 public class Course implements Serializable{
@@ -58,11 +58,11 @@ public class Course implements Serializable{
     @Enumerated(EnumType.ORDINAL)
     private BaseStatusEnum status;
 
-    @Column(name = "gmt_created", updatable = false, insertable = false)
+    @Column(name = "gmt_created", updatable = false, insertable = false, columnDefinition = "timestamp NULL DEFAULT CURRENT_TIMESTAMP")
     @Temporal(TemporalType.TIMESTAMP)
     private Date gmtCreated;
 
-    @Column(name = "gmt_modified")
+    @Column(name = "gmt_modified", updatable = false, insertable = false, columnDefinition = "timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
     @Temporal(TemporalType.TIMESTAMP)
     private Date gmtModified;
 

rankin-data-api/src/main/java/cn/rankin/data/api/product/entity/CourseSubRelation.java

@@ -14,7 +14,7 @@ import java.util.Date;
 @Data
 @ToString
 @Entity
-@Table(name = "course_sub_relation", uniqueConstraints = {@UniqueConstraint(columnNames = {"course_id", "sub_id", "type"})},
+@Table(name = "p_course_sub_relation", uniqueConstraints = {@UniqueConstraint(columnNames = {"course_id", "sub_id", "type"})},
         indexes = {@Index(columnList = "course_id"), @Index(columnList = "sub_id")})
 @DynamicInsert
 @DynamicUpdate
@@ -39,7 +39,7 @@ public class CourseSubRelation implements Serializable {
     @Column
     private BaseStatusEnum status;
 
-    @Column(name = "gmt_created", updatable = false, insertable = false)
+    @Column(name = "gmt_created", updatable = false, insertable = false, columnDefinition = "timestamp NULL DEFAULT CURRENT_TIMESTAMP")
     @Temporal(TemporalType.TIMESTAMP)
     private Date gmtCreated;
 }

rankin-data-api/src/main/java/cn/rankin/data/api/product/entity/CourseSupportRelation.java

@@ -12,7 +12,7 @@ import java.util.Date;
 
 @Data
 @ToString
-@Table(name = "course_support_relation", uniqueConstraints = {@UniqueConstraint(columnNames = {"course_id", "support_id"})},
+@Table(name = "p_course_support_relation", uniqueConstraints = {@UniqueConstraint(columnNames = {"course_id", "support_id"})},
         indexes = {@Index(columnList = "course_id"), @Index(columnList = "support_id")})
 @Entity
 @DynamicInsert

rankin-data-api/src/main/java/cn/rankin/data/api/product/entity/Courseware.java

@@ -15,7 +15,7 @@ import java.util.List;
 @Data
 @ToString
 @Entity
-@Table(name = "courseware", indexes = {@Index(columnList = "code"), @Index(columnList = "name")})
+@Table(name = "p_courseware", indexes = {@Index(columnList = "code"), @Index(columnList = "name")})
 @DynamicInsert
 @DynamicUpdate
 public class Courseware implements Serializable{

rankin-data-api/src/main/java/cn/rankin/data/api/product/entity/Goods.java

@@ -34,7 +34,7 @@ import java.util.Date;
 @Entity
 @DynamicInsert
 @DynamicUpdate
-@Table(name = "goods")
+@Table(name = "p_goods")
 public class Goods implements Serializable {
 
     @Id

rankin-data-api/src/main/java/cn/rankin/data/api/product/entity/Lesson.java

@@ -14,7 +14,7 @@ import java.util.List;
 @Data
 @ToString
 @Entity
-@Table(name = "lesson", indexes = {@Index(columnList = "code"), @Index(columnList = "name")})
+@Table(name = "p_lesson", indexes = {@Index(columnList = "code"), @Index(columnList = "name")})
 @DynamicInsert
 @DynamicUpdate
 public class Lesson implements Serializable {
@@ -38,11 +38,11 @@ public class Lesson implements Serializable {
     @Enumerated(EnumType.ORDINAL)
     private BaseStatusEnum status;
 
-    @Column(name = "gmt_created", updatable = false, insertable = false)
+    @Column(name = "gmt_created", updatable = false, insertable = false, columnDefinition = "timestamp NULL DEFAULT CURRENT_TIMESTAMP")
     @Temporal(TemporalType.TIMESTAMP)
     private Date gmtCreated;
 
-    @Column(name = "gmt_modified")
+    @Column(name = "gmt_modified", updatable = false, insertable = false, columnDefinition = "timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
     @Temporal(TemporalType.TIMESTAMP)
     private Date gmtModified;
 

rankin-data-api/src/main/java/cn/rankin/data/api/product/entity/LessonWareRelation.java

@@ -13,7 +13,7 @@ import java.util.Date;
 @Data
 @ToString
 @Entity
-@Table(name = "lesson_ware_relation", uniqueConstraints = {@UniqueConstraint(columnNames = {"lesson_id", "ware_id"})},
+@Table(name = "p_lesson_ware_relation", uniqueConstraints = {@UniqueConstraint(columnNames = {"lesson_id", "ware_id"})},
         indexes = {@Index(columnList = "lesson_id"), @Index(columnList = "ware_id")})
 @DynamicInsert
 @DynamicUpdate

rankin-data-api/src/main/java/cn/rankin/data/api/product/entity/MerchantProduct.java

@@ -14,7 +14,7 @@ import java.util.List;
 
 @Data
 @ToString
-@Table(name = "merchant_product", uniqueConstraints = {@UniqueConstraint(columnNames = {"pid", "merchant_id"})})
+@Table(name = "p_merchant_product", uniqueConstraints = {@UniqueConstraint(columnNames = {"pid", "merchant_id"})})
 @Entity
 @DynamicUpdate
 @DynamicInsert

rankin-data-api/src/main/java/cn/rankin/data/api/product/entity/MerchantProductTagRelation.java

@@ -12,7 +12,7 @@ import java.util.Date;
 
 @Data
 @ToString
-@Table(name = "product_tag_relation", uniqueConstraints = {@UniqueConstraint(columnNames = {"pid", "tag_id"})},
+@Table(name = "p_product_tag_relation", uniqueConstraints = {@UniqueConstraint(columnNames = {"pid", "tag_id"})},
         indexes = {@Index(columnList = "pid"), @Index(columnList = "tag_id")})
 @Entity
 @DynamicUpdate
@@ -37,7 +37,7 @@ public class MerchantProductTagRelation implements Serializable {
     @Enumerated(EnumType.ORDINAL)
     private BaseStatusEnum status;
 
+    @Column(name = "gmt_created", updatable = false, insertable = false, columnDefinition = "timestamp NULL DEFAULT CURRENT_TIMESTAMP")
     @Temporal(TemporalType.TIMESTAMP)
     private Date gmtCreated;
-
 }

rankin-data-api/src/main/java/cn/rankin/data/api/product/entity/Package.java

@@ -28,7 +28,7 @@ import java.util.List;
 @Entity
 @DynamicInsert
 @DynamicUpdate
-@Table(name = "package")
+@Table(name = "p_package")
 public class Package implements Serializable {
 
     @Id

rankin-data-api/src/main/java/cn/rankin/data/api/product/entity/PackageProductRelation.java

@@ -25,7 +25,7 @@ import java.util.Date;
 @Data
 @ToString
 @Entity
-@Table(name = "package_product_relation")
+@Table(name = "p_package_product_relation")
 @DynamicInsert
 @DynamicUpdate
 public class PackageProductRelation implements Serializable {
@@ -46,7 +46,6 @@ public class PackageProductRelation implements Serializable {
     @Enumerated(EnumType.ORDINAL)
     private BaseStatusEnum status;
 
-
     @Column(name = "gmt_created", updatable = false, insertable = false, columnDefinition = "timestamp NULL DEFAULT CURRENT_TIMESTAMP")
     @Temporal(TemporalType.TIMESTAMP)
     private Date gmtCreated;

rankin-data-api/src/main/java/cn/rankin/data/api/product/entity/Product.java

@@ -16,7 +16,7 @@ import java.util.Date;
 @Entity
 @DynamicUpdate
 @DynamicInsert
-@Table(name = "product")
+@Table(name = "p_product")
 public class Product implements Serializable {
 
     @Id

rankin-data-api/src/main/java/cn/rankin/data/api/product/entity/Recommend.java

@@ -14,7 +14,7 @@ import java.util.Date;
 @Data
 @ToString
 @Entity
-@Table(name = "recommend", uniqueConstraints = {@UniqueConstraint(columnNames = {"merchant_id", "pid"})})
+@Table(name = "p_recommend", uniqueConstraints = {@UniqueConstraint(columnNames = {"merchant_id", "pid"})})
 @DynamicInsert
 @DynamicUpdate
 public class Recommend implements Serializable {

rankin-data-api/src/main/java/cn/rankin/data/api/product/entity/Support.java

@@ -16,7 +16,7 @@ import java.util.List;
 @Data
 @ToString
 @Entity
-@Table(name = "support", indexes = {@Index(columnList = "code"), @Index(columnList = "name")})
+@Table(name = "p_support", indexes = {@Index(columnList = "code"), @Index(columnList = "name")})
 @DynamicInsert
 @DynamicUpdate
 public class Support implements Serializable {
@@ -53,17 +53,14 @@ public class Support implements Serializable {
     @Enumerated(EnumType.ORDINAL)
     private BaseStatusEnum status;
 
-    @Column(name = "gmt_created", insertable = false, updatable = false)
+    @Column(name = "gmt_created", updatable = false, insertable = false, columnDefinition = "timestamp NULL DEFAULT CURRENT_TIMESTAMP")
     @Temporal(TemporalType.TIMESTAMP)
     private Date gmtCreated;
 
-    @Column(name = "gmt_modified")
+    @Column(name = "gmt_modified", updatable = false, insertable = false, columnDefinition = "timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
     @Temporal(TemporalType.TIMESTAMP)
     private Date gmtModified;
 
-//    @ManyToMany(fetch = FetchType.EAGER)
-//    @JoinTable(name = "lj_support_reference", joinColumns = {@JoinColumn(name = "fid", referencedColumnName = "id")},
-//            inverseJoinColumns = {@JoinColumn(name = "tid", referencedColumnName = "id")})
     @Transient
     private List<Support> supportList;
 }

rankin-data-api/src/main/java/cn/rankin/data/api/product/entity/SupportReference.java

@@ -13,7 +13,7 @@ import java.util.Date;
 @Data
 @ToString
 @Entity
-@Table(name = "support_reference", uniqueConstraints = {@UniqueConstraint(columnNames = {"fid", "tid"})},
+@Table(name = "p_support_reference", uniqueConstraints = {@UniqueConstraint(columnNames = {"fid", "tid"})},
         indexes = {@Index(columnList = "fid"), @Index(columnList = "tid")})
 @DynamicInsert
 @DynamicUpdate
@@ -33,7 +33,7 @@ public class SupportReference implements Serializable {
     @Enumerated(EnumType.ORDINAL)
     private BaseStatusEnum status;
 
-    @Column(name = "gmt_created", insertable = false, updatable = false)
+    @Column(name = "gmt_created", updatable = false, insertable = false, columnDefinition = "timestamp NULL DEFAULT CURRENT_TIMESTAMP")
     @Temporal(TemporalType.TIMESTAMP)
     private Date gmtCreated;
 }

rankin-data-api/src/main/java/cn/rankin/data/api/product/entity/Tag.java

@@ -15,7 +15,7 @@ import java.util.List;
 @Data
 @ToString
 @Entity
-@Table(name = "tag", uniqueConstraints = {@UniqueConstraint(columnNames = {"name", "group_id"})},
+@Table(name = "p_tag", uniqueConstraints = {@UniqueConstraint(columnNames = {"name", "group_id"})},
         indexes = {@Index(columnList = "name")})
 @DynamicInsert
 @DynamicUpdate

rankin-data-api/src/main/java/cn/rankin/data/api/product/entity/TagGroup.java

@@ -14,7 +14,7 @@ import java.util.List;
 @Data
 @ToString
 @Entity
-@Table(name = "tag_group", uniqueConstraints = {@UniqueConstraint(columnNames = {"code", "merchant_id"})})
+@Table(name = "p_tag_group", uniqueConstraints = {@UniqueConstraint(columnNames = {"code", "merchant_id"})})
 @DynamicInsert
 @DynamicUpdate
 public class TagGroup implements Serializable {

rankin-data-api/src/main/java/cn/rankin/data/api/resource/OSSSignatureVo.java

@@ -1,25 +0,0 @@
-package cn.rankin.data.api.resource;
-
-import lombok.Data;
-import lombok.ToString;
-
-import java.io.Serializable;
-
-@Data
-@ToString
-public class OSSSignatureVo implements Serializable {
-
-    private String accessid;
-
-    private String policy;
-
-    private String signature;
-
-    private String expire;
-
-    private String dir;
-
-    private String path;
-
-    private String host;
-}

rankin-resource-service/src/main/java/cn/rankin/resourceservice/entity/Resource.java

@@ -1,4 +1,4 @@
-package cn.rankin.resourceservice.entity;
+package cn.rankin.data.api.resource.entity;
 
 import cn.rankin.common.utils.enums.BaseStatusEnum;
 import com.fasterxml.jackson.annotation.JsonIgnore;
@@ -14,7 +14,7 @@ import java.util.Date;
 @Data
 @ToString
 @Entity
-@Table(name = "lj_resource")
+@Table(name = "r_resource")
 @DynamicInsert
 @DynamicUpdate
 public class Resource implements Serializable {
@@ -47,27 +47,14 @@ public class Resource implements Serializable {
     @Enumerated(EnumType.ORDINAL)
     private BaseStatusEnum status;
 
-    @Column(name = "gmt_created")
+    @Column(name = "gmt_created", updatable = false, insertable = false, columnDefinition = "timestamp NULL DEFAULT CURRENT_TIMESTAMP")
     @Temporal(TemporalType.TIMESTAMP)
     private Date gmtCreated;
 
-    @Column(name = "gmt_modified")
+    @Column(name = "gmt_modified", updatable = false, insertable = false, columnDefinition = "timestamp NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP")
     @Temporal(TemporalType.TIMESTAMP)
     private Date gmtModified;
 
     @Transient
     private String url;
-
-    @JsonIgnore
-    public boolean isRight() {
-        if (code == null || code.length() == 0) {
-            return false;
-        }
-
-        if (path == null || path.length() == 0) {
-            return false;
-        }
-
-        return true;
-    }
 }

rankin-resource-service/src/main/java/cn/rankin/resourceservice/vo/OSSSignature.java

@@ -1,4 +1,4 @@
-package cn.rankin.resourceservice.vo;
+package cn.rankin.data.api.resource.vo;
 
 import lombok.Data;
 

rankin-data-api/src/main/java/cn/rankin/data/api/trade/entity/UserOrder.java

@@ -15,10 +15,10 @@ import java.util.List;
 @Data
 @ToString
 @Entity
-@Table(name = "user_order")
+@Table(name = "t_order")
 @DynamicInsert
 @DynamicUpdate
-public class UserOrder implements Serializable {
+public class Order implements Serializable {
 
     @Id
     private String id;

rankin-data-api/src/main/java/cn/rankin/data/api/trade/entity/UserOrderSplit.java

@@ -15,10 +15,10 @@ import java.util.List;
 @Data
 @ToString
 @Entity
-@Table(name = "user_order_split")
+@Table(name = "t_order_detail")
 @DynamicInsert
 @DynamicUpdate
-public class UserOrderSplit implements Serializable {
+public class OrderDetail implements Serializable {
 
     @Id
     private String id;

rankin-data-api/src/main/java/cn/rankin/data/api/trade/entity/OrderGoods.java

@@ -13,7 +13,7 @@ import java.util.Date;
 @Data
 @ToString
 @Entity
-@Table(name = "order_goods")
+@Table(name = "t_order_goods")
 @DynamicInsert
 @DynamicUpdate
 public class OrderGoods implements Serializable {

rankin-data-api/src/main/java/cn/rankin/data/api/trade/entity/ProductSoldSnapshot.java

@@ -42,10 +42,10 @@ import java.util.Date;
 @Data
 @ToString
 @Entity
-@Table(name = "product_sold_snapshot")
+@Table(name = "t_order_product_snapshot")
 @DynamicInsert
 @DynamicUpdate
-public class ProductSoldSnapshot implements Serializable {
+public class OrderProductSnapshot implements Serializable {
 
     @Id
     private String id;

rankin-data-api/src/main/java/cn/rankin/data/api/user/entity/Campus.java

@@ -14,7 +14,7 @@ import java.util.Date;
 @Data
 @ToString
 @Entity
-@Table(name = "campus", uniqueConstraints = {@UniqueConstraint(columnNames = {"merchant_id", "serial_no", "province_code"})})
+@Table(name = "u_campus", uniqueConstraints = {@UniqueConstraint(columnNames = {"merchant_id", "serial_no", "province_code"})})
 @DynamicInsert
 @DynamicUpdate
 public class Campus implements Serializable {

rankin-data-api/src/main/java/cn/rankin/data/api/user/entity/CmsUser.java

@@ -17,7 +17,7 @@ import java.util.Date;
 @Data
 @ToString
 @Entity
-@Table(name = "cms_user")
+@Table(name = "u_cms_user")
 @DynamicInsert
 @DynamicUpdate
 public class CmsUser implements Serializable {

rankin-data-api/src/main/java/cn/rankin/data/api/user/entity/Ledger.java

@@ -14,7 +14,7 @@ import java.util.Date;
 @Data
 @ToString
 @Entity
-@Table(name = "ledger")
+@Table(name = "u_ledger")
 @DynamicInsert
 @DynamicUpdate
 public class Ledger implements Serializable {

rankin-data-api/src/main/java/cn/rankin/data/api/user/entity/Merchant.java

@@ -19,7 +19,7 @@ import java.util.List;
 @Data
 @ToString
 @Entity
-@Table(name = "merchant")
+@Table(name = "u_merchant")
 @DynamicInsert
 @DynamicUpdate
 public class Merchant implements Serializable {

rankin-data-api/src/main/java/cn/rankin/data/api/user/entity/OperationLog.java

@@ -17,7 +17,7 @@ import java.util.Date;
 @Data
 @ToString
 @Entity
-@Table(name="operation_log")
+@Table(name="u_operation_log")
 @DynamicInsert
 @DynamicUpdate
 public class OperationLog implements Serializable {
@@ -53,10 +53,7 @@ public class OperationLog implements Serializable {
 	@Column(name="method_name")
 	private String methodName;
 
-	@Column(name = "gmt_created")
-	@Temporal(TemporalType.TIMESTAMP)
-	private Date gmtCreated;
-
-
-
+    @Column(name = "gmt_created", updatable = false, insertable = false, columnDefinition = "timestamp NULL DEFAULT CURRENT_TIMESTAMP")
+    @Temporal(TemporalType.TIMESTAMP)
+    private Date gmtCreated;
 }

rankin-data-api/src/main/java/cn/rankin/data/api/user/entity/Resource.java

@@ -16,7 +16,7 @@ import java.io.Serializable;
 @Data
 @ToString
 @Entity
-@Table(name="resource")
+@Table(name="u_resource")
 @DynamicInsert
 @DynamicUpdate
 public class Resource implements Serializable {

rankin-data-api/src/main/java/cn/rankin/data/api/user/entity/Role.java

@@ -19,7 +19,7 @@ import java.util.List;
 @Data
 @ToString
 @Entity
-@Table(name="role")
+@Table(name="u_role")
 @DynamicInsert
 @DynamicUpdate
 public class Role implements Serializable {
@@ -40,7 +40,7 @@ public class Role implements Serializable {
 	private BaseStatusEnum status;
 
 	@ManyToMany(fetch= FetchType.EAGER)
-	@JoinTable(name="role_resource", joinColumns={@JoinColumn(name="roleId")},inverseJoinColumns={@JoinColumn(name="resourceId")})
+	@JoinTable(name="u_role_resource_relation", joinColumns={@JoinColumn(name="roleId")},inverseJoinColumns={@JoinColumn(name="resourceId")})
 	private List<Resource> resources;
 
     @Column(name="gmt_modified")

rankin-data-api/src/main/java/cn/rankin/data/api/user/entity/TerminalDevice.java

@@ -19,7 +19,7 @@ import java.util.Date;
 @Data
 @ToString
 @Entity
-@Table(name="device")
+@Table(name="u_device")
 @DynamicInsert
 @DynamicUpdate
 public class TerminalDevice implements Serializable {

rankin-data-api/src/main/java/cn/rankin/data/api/user/entity/TerminalUser.java

@@ -14,7 +14,7 @@ import java.util.Date;
 @Data
 @ToString
 @Entity
-@Table(name = "terminal_user")
+@Table(name = "u_terminal_user")
 @DynamicInsert
 @DynamicUpdate
 public class TerminalUser implements Serializable {
@@ -66,8 +66,4 @@ public class TerminalUser implements Serializable {
     @Transient
     private String campusName;
 
-//    public void setCampusName(String campusName) {
-//        this.campusName = String.format("%s-%s", campusName, name);
-//    }
-
 }

rankin-data-api/src/main/java/cn/rankin/data/api/user/entity/UserRole.java

@@ -19,7 +19,7 @@ import java.io.Serializable;
 @Data
 @ToString
 @Entity
-@Table(name="user_role")
+@Table(name="u_user_role")
 @DynamicInsert
 @DynamicUpdate
 public class UserRole implements Serializable {

rankin-resource-service/pom.xml

@@ -63,6 +63,11 @@
             <artifactId>rankin-common-utils</artifactId>
             <version>0.0.1-SNAPSHOT</version>
         </dependency>
+        <dependency>
+            <groupId>cn.rankin</groupId>
+            <artifactId>rankin-data-api</artifactId>
+            <version>0.0.1-SNAPSHOT</version>
+        </dependency>
 
 		<dependency>
 			<groupId>org.springframework.boot</groupId>

rankin-resource-service/src/main/java/cn/rankin/resourceservice/configuration/PersistConfiguration.java

@@ -0,0 +1,52 @@
+package cn.rankin.resourceservice.configuration;
+
+import com.fasterxml.jackson.annotation.JsonAutoDetect;
+import com.fasterxml.jackson.annotation.PropertyAccessor;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.boot.autoconfigure.domain.EntityScan;
+import org.springframework.context.EnvironmentAware;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+import org.springframework.core.env.Environment;
+import org.springframework.data.redis.connection.jedis.JedisConnectionFactory;
+import org.springframework.data.redis.core.RedisTemplate;
+import org.springframework.data.redis.serializer.Jackson2JsonRedisSerializer;
+import org.springframework.data.redis.serializer.StringRedisSerializer;
+
+
+/**
+ * 类名：PersistConfiguration  <br />
+ *
+ * 功能：持久化相关配置
+ *
+ * @author xtwin <br />
+ * 创建时间：2016年7月26日 上午9:56:48  <br />
+ * @version 2016年7月26日
+ */
+@Configuration
+@EntityScan(basePackages={"cn.rankin.data.api.resource"})
+public class PersistConfiguration implements EnvironmentAware {
+	
+	// 日志记录器
+	private static final Logger logger = LoggerFactory.getLogger(PersistConfiguration.class);
+	
+	// 应用环境信息
+	private Environment environment;
+
+	/**
+	 * 功能: 由spring注入环境信息 <br/>
+	 * 
+	 * 重写：xtwin <br/>
+	 * 
+	 * @version ：2016年7月27日 上午10:02:15<br/>
+	 * 
+	 * @param environment <br/>
+	 * @see EnvironmentAware#setEnvironment(Environment)
+	 */
+	@Override
+	public void setEnvironment(Environment environment) {
+		this.environment = environment;
+	}
+}

rankin-resource-service/src/main/java/cn/rankin/resourceservice/controller/AliOSSController.java

@@ -2,7 +2,7 @@ package cn.rankin.resourceservice.controller;
 
 import cn.rankin.common.utils.api.model.APICode;
 import cn.rankin.common.utils.api.model.APIResult;
-import cn.rankin.resourceservice.vo.OSSSignature;
+import cn.rankin.data.api.resource.vo.OSSSignature;
 import com.aliyun.oss.OSSClient;
 import com.aliyun.oss.common.utils.BinaryUtil;
 import com.aliyun.oss.model.MatchMode;

rankin-resource-service/src/main/java/cn/rankin/resourceservice/controller/ResourceController.java

@@ -4,13 +4,14 @@ import cn.rankin.common.utils.api.model.APICode;
 import cn.rankin.common.utils.api.model.APIResult;
 import cn.rankin.common.utils.api.page.Page;
 import cn.rankin.common.utils.dto.resource.ResourceSearchDTO;
-import cn.rankin.resourceservice.entity.Resource;
-import cn.rankin.resourceservice.entity.ResourceType;
+import cn.rankin.data.api.resource.entity.Resource;
+import cn.rankin.common.utils.enums.ResourceType;
 import cn.rankin.resourceservice.service.ResourceService;
 import com.alibaba.fastjson.JSON;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.lang.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.util.CollectionUtils;
 import org.springframework.web.bind.annotation.*;
 
 import java.util.List;
@@ -60,7 +61,7 @@ public class ResourceController {
 
     @RequestMapping(method = RequestMethod.POST)
     public APIResult<Resource> create(@RequestBody Resource resource) {
-        if (!resource.isRight() || resource.getId() != null) {
+        if (StringUtils.isEmpty(resource.getCode()) || StringUtils.isEmpty(resource.getPath())) {
             return APIResult.error(APICode.PARAMETER_ERROR);
         }
 

rankin-resource-service/src/main/java/cn/rankin/resourceservice/dto/ResourceDetail.java

@@ -1,8 +1,8 @@
 package cn.rankin.resourceservice.dto;
 
 import cn.rankin.common.utils.enums.BaseStatusEnum;
-import cn.rankin.resourceservice.entity.Resource;
-import cn.rankin.resourceservice.entity.ResourceType;
+import cn.rankin.data.api.resource.entity.Resource;
+import cn.rankin.common.utils.enums.ResourceType;
 import lombok.Data;
 import lombok.ToString;
 

rankin-resource-service/src/main/java/cn/rankin/resourceservice/dto/ResourceRemote.java

@@ -5,8 +5,8 @@ import java.util.*;
 import javax.persistence.*;
 
 import cn.rankin.common.utils.enums.BaseStatusEnum;
-import cn.rankin.resourceservice.entity.Resource;
-import cn.rankin.resourceservice.entity.ResourceType;
+import cn.rankin.data.api.resource.entity.Resource;
+import cn.rankin.common.utils.enums.ResourceType;
 import lombok.Data;
 
 @Data

rankin-resource-service/src/main/java/cn/rankin/resourceservice/repository/ResourceRepository.java

@@ -1,7 +1,7 @@
 package cn.rankin.resourceservice.repository;
 
 import cn.rankin.common.utils.jpa.BasicJpaRepository;
-import cn.rankin.resourceservice.entity.Resource;
+import cn.rankin.data.api.resource.entity.Resource;
 import org.springframework.stereotype.Repository;
 
 @Repository

rankin-resource-service/src/main/java/cn/rankin/resourceservice/service/ResourceService.java

@@ -6,7 +6,7 @@ import cn.rankin.common.utils.api.page.Page;
 import cn.rankin.common.utils.dto.resource.ResourceSearchDTO;
 import cn.rankin.resourceservice.dto.ResourceDetail;
 import cn.rankin.resourceservice.dto.ResourceRemote;
-import cn.rankin.resourceservice.entity.Resource;
+import cn.rankin.data.api.resource.entity.Resource;
 import cn.rankin.resourceservice.proxy.RemoteResourceProxy;
 import cn.rankin.resourceservice.repository.ResourceRepository;
 import lombok.extern.slf4j.Slf4j;

rankin-resource-service/src/test/java/cn/rankin/resourceservice/service/ResourceServiceTest.java

@@ -1,8 +1,7 @@
 package cn.rankin.resourceservice.service;
 
-import cn.rankin.common.utils.api.model.APIResult;
 import cn.rankin.resourceservice.ResourceServiceApplication;
-import cn.rankin.resourceservice.entity.Resource;
+import cn.rankin.data.api.resource.entity.Resource;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -12,7 +11,6 @@ import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Map;
 
 @Slf4j
 @RunWith(SpringJUnit4ClassRunner.class)

rankin-task/src/main/java/cn/rankin/task/service/TradeService.java

@@ -1,8 +1,7 @@
 package cn.rankin.task.service;
 
 import cn.rankin.common.utils.api.model.APIResult;
-import cn.rankin.common.utils.enums.OrderStatusEnum;
-import cn.rankin.data.api.trade.entity.UserOrder;
+import cn.rankin.data.api.trade.entity.Order;
 import cn.rankin.task.code.TaskAPICode;
 import org.springframework.cloud.netflix.feign.FeignClient;
 import org.springframework.stereotype.Component;
@@ -17,10 +16,10 @@ import java.util.List;
 public interface TradeService {
 
     @RequestMapping(value = "/order/pay/list", method = RequestMethod.GET)
-    APIResult<List<UserOrder>> findPayList(@RequestParam("limit") Integer limit);
+    APIResult<List<Order>> findPayList(@RequestParam("limit") Integer limit);
 
     @RequestMapping(value = "/order/pay/{orderId}", method = RequestMethod.POST)
-    APIResult<Boolean> complete(@PathVariable("orderId") String orderId, @RequestParam("status") OrderStatusEnum status);
+    APIResult<Boolean> complete(@PathVariable("orderId") String orderId);
 
     @Component
     class TradeServiceHystrix implements TradeService {
@@ -31,7 +30,7 @@ public interface TradeService {
         }
 
         @Override
-        public APIResult complete(String orderId, OrderStatusEnum status) {
+        public APIResult complete(String orderId) {
             return APIResult.error(TaskAPICode.SERVER_ERROR);
         }
 

rankin-task/src/main/java/cn/rankin/task/task/order/OrderCompleteTask.java

@@ -1,15 +1,14 @@
 package cn.rankin.task.task.order;
 
 import cn.rankin.common.utils.api.model.APIResult;
-import cn.rankin.common.utils.constant.Constant;
 import cn.rankin.common.utils.enums.OrderStatusEnum;
 import cn.rankin.common.utils.enums.ProductTypeEnum;
 import cn.rankin.data.api.product.vo.GoodsVo;
 import cn.rankin.data.api.product.vo.PackageVo;
 import cn.rankin.data.api.product.vo.ProductVo;
 import cn.rankin.data.api.trade.entity.OrderGoods;
-import cn.rankin.data.api.trade.entity.ProductSoldSnapshot;
-import cn.rankin.data.api.trade.entity.UserOrder;
+import cn.rankin.data.api.trade.entity.OrderProductSnapshot;
+import cn.rankin.data.api.trade.entity.Order;
 import cn.rankin.data.api.user.vo.CampusVo;
 import cn.rankin.data.api.user.vo.TerminalUserVo;
 import cn.rankin.task.service.ProductService;
@@ -46,22 +45,22 @@ public class OrderCompleteTask {
     @Scheduled(fixedDelay = ONE_MINUTE)
     public void run() {
         // 查询订单
-        APIResult<List<UserOrder>> orderListResult = tradeService.findPayList(SIZE);
+        APIResult<List<Order>> orderListResult = tradeService.findPayList(SIZE);
         if (!orderListResult.getSuccess()) {
             log.error("get order list error: {}", orderListResult.getMessage());
             return;
         }
 
-        List<UserOrder> userOrderList = orderListResult.getData();
-        if (CollectionUtils.isEmpty(userOrderList)) {
+        List<Order> orderList = orderListResult.getData();
+        if (CollectionUtils.isEmpty(orderList)) {
             log.info("order list empty, return");
             return;
         }
 
         //取预加载信息所需信息
         List<String> userIdList = new ArrayList<>();
-        for (UserOrder userOrder : userOrderList) {
-            String userId = userOrder.getUid();
+        for (Order order : orderList) {
+            String userId = order.getUid();
             if (!userIdList.contains(userId)) {
                 userIdList.add(userId);
             }
@@ -91,8 +90,8 @@ public class OrderCompleteTask {
         }
 
         // 逐单处理
-        for (UserOrder userOrder : userOrderList) {
-            String orderId = userOrder.getId();
+        for (Order order : orderList) {
+            String orderId = order.getId();
             APIResult<Boolean> orderChangeResult = tradeService.complete(orderId, OrderStatusEnum.COMPLETE);
             if (!orderChangeResult.getSuccess()) {
                 log.error("order complete status error, orderId={}", orderId);
@@ -103,10 +102,10 @@ public class OrderCompleteTask {
         }
     }
 
-    public List<ProductSoldSnapshot> toSnaptshots(UserOrder userOrder, TerminalUserVo terminalUserVo, CampusVo campusVo) {
-        List<ProductSoldSnapshot> snapshotList = new ArrayList<>();
-        String orderId = userOrder.getId();
-        String userId = userOrder.getUid();
+    public List<OrderProductSnapshot> toSnaptshots(Order order, TerminalUserVo terminalUserVo, CampusVo campusVo) {
+        List<OrderProductSnapshot> snapshotList = new ArrayList<>();
+        String orderId = order.getId();
+        String userId = order.getUid();
         String userName = terminalUserVo.getName();
         String userCode = terminalUserVo.getCode();
         String campusId = campusVo.getId();
@@ -115,7 +114,7 @@ public class OrderCompleteTask {
 
         List<String> goodsIdList = new ArrayList<>();
         List<String> productIdList = new ArrayList<>();
-        List<OrderGoods> orderGoodsList = userOrder.getGoods();
+        List<OrderGoods> orderGoodsList = order.getGoods();
 
         for (OrderGoods orderGoods : orderGoodsList) {
             ProductTypeEnum type = orderGoods.getType();

rankin-task/src/main/java/cn/rankin/task/task/order/OrderSplitTask.java

@@ -1,8 +1,8 @@
 package cn.rankin.task.task.order;
 
 import cn.rankin.common.utils.api.model.APIResult;
-import cn.rankin.data.api.trade.entity.UserOrder;
-import cn.rankin.data.api.trade.entity.UserOrderSplit;
+import cn.rankin.data.api.trade.entity.Order;
+import cn.rankin.data.api.trade.entity.OrderDetail;
 import cn.rankin.task.service.TradeService;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -24,13 +24,13 @@ public class OrderSplitTask {
 
     @Scheduled(fixedDelay = ONE_MINUTE)
     public void run() {
-        List<UserOrder> userOrderList = loadOrder(SIZE);
+        List<Order> orderList = loadOrder(SIZE);
 
     }
 
     // 取订单
-    public List<UserOrder> loadOrder(Integer limit) {
-        APIResult<List<UserOrder>> apiResult = tradeService.findPayList(limit);
+    public List<Order> loadOrder(Integer limit) {
+        APIResult<List<Order>> apiResult = tradeService.findPayList(limit);
         if (!apiResult.getSuccess()) {
             log.error("load order error: %s", apiResult.getMessage());
             return null;
@@ -39,7 +39,7 @@ public class OrderSplitTask {
     }
 
     // 分拆
-    public List<UserOrderSplit> splitOrder(List<UserOrder> userOrderList) {
+    public List<OrderDetail> splitOrder(List<Order> orderList) {
         return null;
     }
 

rankin-trade-service/src/main/java/cn/rankin/tradeservice/controller/OrderController.java

@@ -5,7 +5,7 @@ import cn.rankin.common.utils.api.page.Page;
 import cn.rankin.common.utils.enums.OrderStatusEnum;
 import cn.rankin.data.api.trade.dto.OrderSearchDTO;
 import cn.rankin.data.api.trade.dto.UserOrderDTO;
-import cn.rankin.data.api.trade.entity.UserOrder;
+import cn.rankin.data.api.trade.entity.Order;
 import cn.rankin.tradeservice.service.OrderService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
@@ -21,23 +21,23 @@ public class OrderController {
 
     // cms web需要做前置校验
     @RequestMapping(method = RequestMethod.POST)
-    public APIResult<UserOrder> create(@RequestBody UserOrderDTO userOrderDTO) {
+    public APIResult<Order> create(@RequestBody UserOrderDTO userOrderDTO) {
         return orderService.create(userOrderDTO);
     }
 
     @RequestMapping(value = "/{orderId}", method = RequestMethod.GET)
-    public APIResult<UserOrder> getOrder(@PathVariable String orderId) {
+    public APIResult<Order> getOrder(@PathVariable String orderId) {
         return orderService.getOrder(orderId);
     }
 
     @RequestMapping(value = "/list", method = RequestMethod.GET)
-    public APIResult<Page<UserOrder>> search(OrderSearchDTO searchDTO) {
+    public APIResult<Page<Order>> search(OrderSearchDTO searchDTO) {
         return orderService.search(searchDTO);
     }
 
     @RequestMapping(value = "/pay/{orderId}", method = RequestMethod.POST)
     public APIResult<Boolean> pay(@PathVariable("orderId") String orderId) {
-        return orderService.pay(orderId, OrderStatusEnum.PAYOK);
+        return orderService.ok(orderId);
     }
 
     @RequestMapping(value = "/pay/{orderId}", method = RequestMethod.DELETE)
@@ -47,7 +47,7 @@ public class OrderController {
 
     // 内部task调用
     @RequestMapping(value = "/pay/list", method = RequestMethod.GET)
-    public APIResult<List<UserOrder>> getPayList(@RequestParam("limit") Integer limit) {
+    public APIResult<List<Order>> getPayList(@RequestParam("limit") Integer limit) {
         return orderService.findPayList(limit);
     }
 }

rankin-trade-service/src/main/java/cn/rankin/tradeservice/repository/OrderRepository.java

@@ -1,34 +1,22 @@
 package cn.rankin.tradeservice.repository;
 
 import cn.rankin.common.utils.jpa.BasicJpaRepository;
-import cn.rankin.data.api.trade.entity.UserOrder;
+import cn.rankin.data.api.trade.entity.Order;
 import org.springframework.data.jpa.repository.Modifying;
 import org.springframework.data.jpa.repository.Query;
 
 import java.util.List;
 
-public interface OrderRepository extends BasicJpaRepository<UserOrder, String> {
+public interface OrderRepository extends BasicJpaRepository<Order, String> {
 
     @Modifying(clearAutomatically = true)
-    @Query(value = "update UserOrder o set o.status = 1 where o.status = 0 and o.id = ?1")
+    @Query(value = "update Order o set o.status = 1 where o.status = 0 and o.id = ?1")
     Integer pay(String orderId);
 
     @Modifying(clearAutomatically = true)
-    @Query(value = "update UserOrder o set o.status = 4 where o.status = 1 and o.id = ?1")
-    Integer send(String orderId);
-
-    @Modifying(clearAutomatically = true)
-    @Query(value = "update UserOrder o set o.status = 5 where o.status = 4 and o.id = ?1")
-    Integer received(String orderId);
-
-    @Modifying(clearAutomatically = true)
-    @Query(value = "update UserOrder o set o.status = 6 where o.status = 5 and o.id = ?1")
-    Integer complete(String orderId);
-
-    @Modifying(clearAutomatically = true)
-    @Query(value = "update UserOrder o set o.status = 2 where o.status = 0 and o.id = ?1")
+    @Query(value = "update Order o set o.status = 2 where o.status = 0 and o.id = ?1")
     Integer cancel(String orderId);
 
     @Query(value = "select * from user_order o where o.status in (1, 5) limit ?1", nativeQuery = true)
-    List<UserOrder> findPayList(Integer limit);
+    List<Order> findPayList(Integer limit);
 }

rankin-trade-service/src/main/java/cn/rankin/tradeservice/repository/ProductSoldSnapshotRepository.java

@@ -1,7 +1,7 @@
 package cn.rankin.tradeservice.repository;
 
 import cn.rankin.common.utils.jpa.BasicJpaRepository;
-import cn.rankin.data.api.trade.entity.ProductSoldSnapshot;
+import cn.rankin.data.api.trade.entity.OrderProductSnapshot;
 
-public interface ProductSoldSnapshotRepository extends BasicJpaRepository<ProductSoldSnapshot, String> {
+public interface ProductSoldSnapshotRepository extends BasicJpaRepository<OrderProductSnapshot, String> {
 }

rankin-trade-service/src/main/java/cn/rankin/tradeservice/service/OrderService.java

@@ -9,7 +9,7 @@ import cn.rankin.data.api.trade.dto.OrderSearchDTO;
 import cn.rankin.data.api.trade.dto.UserOrderDTO;
 import cn.rankin.data.api.trade.dto.OrderGoodsDTO;
 import cn.rankin.data.api.trade.entity.OrderGoods;
-import cn.rankin.data.api.trade.entity.UserOrder;
+import cn.rankin.data.api.trade.entity.Order;
 import cn.rankin.tradeservice.code.TradeServiceAPICode;
 import cn.rankin.tradeservice.repository.OrderRepository;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,17 +36,8 @@ public class OrderService {
     private OrderGoodsService orderGoodsService;
 
     @Transactional
-    public APIResult<Boolean> pay(String orderId, OrderStatusEnum status) {
-        Integer count = 0;
-        if (status.equals(OrderStatusEnum.PAYOK)) {
-            count = orderRepository.pay(orderId);
-        }else if (status.equals(OrderStatusEnum.SEND)) {
-            count = orderRepository.send(orderId);
-        }else if (status.equals(OrderStatusEnum.RECEIVED)) {
-            count = orderRepository.received(orderId);
-        }else if (status.equals(OrderStatusEnum.COMPLETE)) {
-            count = orderRepository.complete(orderId);
-        }
+    public APIResult<Boolean> ok(String orderId) {
+        Integer count = orderRepository.pay(orderId);
         if (count > 0) {
             return APIResult.ok();
         }
@@ -63,38 +54,38 @@ public class OrderService {
     }
 
     @Transactional
-    public APIResult<UserOrder> create(UserOrderDTO userOrderDTO) {
-        UserOrder userOrder = convert(userOrderDTO);
-        userOrder.setStatus(OrderStatusEnum.UNPAID);
-        userOrder = orderRepository.saveAndFlush(userOrder);
-        String orderId = userOrder.getId();
+    public APIResult<Order> create(UserOrderDTO userOrderDTO) {
+        Order order = convert(userOrderDTO);
+        order.setStatus(OrderStatusEnum.UNPAID);
+        order = orderRepository.saveAndFlush(order);
+        String orderId = order.getId();
         List<OrderGoodsDTO> orderGoodsDTOList = userOrderDTO.getGoods();
         orderGoodsService.createRelation(orderId, orderGoodsDTOList);
         List<OrderGoods> orderGoodsList = orderGoodsService.findByOrderId(orderId);
-        userOrder.setGoods(orderGoodsList);
-        return APIResult.ok(userOrder);
+        order.setGoods(orderGoodsList);
+        return APIResult.ok(order);
     }
 
-    public APIResult<UserOrder> getOrder(String orderId) {
-        UserOrder userOrder = orderRepository.find(orderId);
-        if (userOrder == null) {
+    public APIResult<Order> getOrder(String orderId) {
+        Order order = orderRepository.find(orderId);
+        if (order == null) {
             return APIResult.error(TradeServiceAPICode.NOT_EXISTS);
         }
 
         List<OrderGoods> orderGoodsList = orderGoodsService.findByOrderId(orderId);
-        userOrder.setGoods(orderGoodsList);
-        return APIResult.ok(userOrder);
+        order.setGoods(orderGoodsList);
+        return APIResult.ok(order);
     }
 
-    public APIResult<List<UserOrder>> findPayList(Integer limit) {
-        List<UserOrder> userOrderList = orderRepository.findPayList(limit);
-        if (CollectionUtils.isEmpty(userOrderList)) {
-            return APIResult.ok(userOrderList);
+    public APIResult<List<Order>> findPayList(Integer limit) {
+        List<Order> orderList = orderRepository.findPayList(limit);
+        if (CollectionUtils.isEmpty(orderList)) {
+            return APIResult.ok(orderList);
         }
 
         List<String> orderIdList = new ArrayList<>();
-        for (UserOrder userOrder : userOrderList) {
-            orderIdList.add(userOrder.getId());
+        for (Order order : orderList) {
+            orderIdList.add(order.getId());
         }
 
         List<OrderGoods> orderGoodsList = orderGoodsService.findByOrderIds(orderIdList);
@@ -111,25 +102,25 @@ public class OrderService {
             }
         }
 
-        for (UserOrder userOrder : userOrderList) {
-            String orderId = userOrder.getId();
+        for (Order order : orderList) {
+            String orderId = order.getId();
             List<OrderGoods> tmpList = orderGoodsMap.get(orderId);
-            userOrder.setGoods(tmpList);
+            order.setGoods(tmpList);
         }
 
-        return APIResult.ok(userOrderList);
+        return APIResult.ok(orderList);
     }
 
-    public APIResult<Page<UserOrder>> search(OrderSearchDTO searchDTO) {
-        Specification<UserOrder> specification = new Specification<UserOrder>() {
+    public APIResult<Page<Order>> search(OrderSearchDTO searchDTO) {
+        Specification<Order> specification = new Specification<Order>() {
             @Override
-            public Predicate toPredicate(Root<UserOrder> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
+            public Predicate toPredicate(Root<Order> root, CriteriaQuery<?> query, CriteriaBuilder cb) {
                 return OrderService.this.toPredicate(root, query, cb, searchDTO);
             }
         };
 
         Long count = orderRepository.count(specification);
-        Page<UserOrder> page = new Page<>(count, searchDTO.getPageNo(), searchDTO.getPageSize());
+        Page<Order> page = new Page<>(count, searchDTO.getPageNo(), searchDTO.getPageSize());
 
         Long start = page.getStart();
         if (count == 0) {
@@ -138,13 +129,13 @@ public class OrderService {
 
         LinkedHashMap<String, BaseOrderEnum> sort = new LinkedHashMap<>();
         sort.put("gmtModified", BaseOrderEnum.DESC);
-        List<UserOrder> userOrderList = orderRepository.find(specification, start, page.getPageSize(), JpaSortUtil.sort(sort));
-        page.setList(userOrderList);
+        List<Order> orderList = orderRepository.find(specification, start, page.getPageSize(), JpaSortUtil.sort(sort));
+        page.setList(orderList);
 
         return APIResult.ok(page);
     }
 
-    public Predicate toPredicate(Root<UserOrder> root, CriteriaQuery<?> query, CriteriaBuilder cb, OrderSearchDTO searchDTO) {
+    public Predicate toPredicate(Root<Order> root, CriteriaQuery<?> query, CriteriaBuilder cb, OrderSearchDTO searchDTO) {
         // 存放查询条件
         List<Predicate> list = new ArrayList<Predicate>();
         Predicate tmp = null;

rankin-trade-service/src/main/java/cn/rankin/tradeservice/utils/DTOConverter.java

@@ -2,16 +2,16 @@ package cn.rankin.tradeservice.utils;
 
 import cn.rankin.data.api.trade.dto.UserOrderDTO;
 import cn.rankin.data.api.trade.dto.OrderGoodsDTO;
-import cn.rankin.data.api.trade.entity.UserOrder;
+import cn.rankin.data.api.trade.entity.Order;
 import cn.rankin.data.api.trade.entity.OrderGoods;
 import org.springframework.beans.BeanUtils;
 
 public class DTOConverter {
 
-    public static UserOrder convert(UserOrderDTO userOrderDTO) {
-        UserOrder userOrder = new UserOrder();
-        BeanUtils.copyProperties(userOrderDTO, userOrder);
-        return userOrder;
+    public static Order convert(UserOrderDTO userOrderDTO) {
+        Order order = new Order();
+        BeanUtils.copyProperties(userOrderDTO, order);
+        return order;
     }
 
     public static OrderGoods convert(String orderId, OrderGoodsDTO orderGoodsDTO) {

rankin-trade-service/src/test/java/cn/rankin/tradeservice/repository/OrderRepositoryTest.java

@@ -1,6 +1,6 @@
 package cn.rankin.tradeservice.repository;
 
-import cn.rankin.data.api.trade.entity.UserOrder;
+import cn.rankin.data.api.trade.entity.Order;
 import cn.rankin.tradeservice.TradeServiceApplication;
 import lombok.extern.slf4j.Slf4j;
 import org.junit.Test;
@@ -11,8 +11,6 @@ import org.springframework.test.context.junit4.SpringRunner;
 
 import java.util.List;
 
-import static org.junit.Assert.*;
-
 @Slf4j
 @RunWith(SpringRunner.class)
 @SpringBootTest(classes = TradeServiceApplication.class)
@@ -23,7 +21,7 @@ public class OrderRepositoryTest {
 
     @Test
     public void findPayList() throws Exception {
-        List<UserOrder> userOrderList = orderRepository.findPayList(10);
+        List<Order> orderList = orderRepository.findPayList(10);
     }
 
 }

rankin-trade-service/src/test/java/cn/rankin/tradeservice/service/OrderServiceTest.java

@@ -1,9 +1,5 @@
 package cn.rankin.tradeservice.service;
 
-import cn.rankin.common.utils.api.model.APIResult;
-import cn.rankin.common.utils.api.page.Page;
-import cn.rankin.data.api.trade.dto.OrderSearchDTO;
-import cn.rankin.data.api.trade.entity.UserOrder;
 import cn.rankin.tradeservice.TradeServiceApplication;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -11,8 +7,6 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.context.SpringBootTest;
 import org.springframework.test.context.junit4.SpringJUnit4ClassRunner;
 
-import static org.junit.Assert.*;
-
 @RunWith(SpringJUnit4ClassRunner.class)
 @SpringBootTest(classes = TradeServiceApplication.class)
 public class OrderServiceTest {