增加代购商品的物流状态

platform-admin/src/main/java/com/platform/entity/TbCfPlatformOrderEntity.java

@@ -9,7 +9,7 @@ import java.util.Date;
  * 表名 tb_cf_platform_order
  *
  * @author lipengjun
- * @date 2019-09-20 11:03:37
+ * @date 2020-06-05 11:22:12
  */
 public class TbCfPlatformOrderEntity implements Serializable {
     private static final long serialVersionUID = 1L;
@@ -26,6 +26,10 @@ public class TbCfPlatformOrderEntity implements Serializable {
      * 第三方订单id
      */
     private String pOrderId;
+    /**
+     * 商品ID
+     */
+    private String itemId;
     /**
      * 第三方平台名
      */
@@ -41,16 +45,11 @@ public class TbCfPlatformOrderEntity implements Serializable {
     /**
      * 代购人
      */
-    private String agentName;
+    private String userName;
     /**
      * 代购人id
      */
-    private String agentId;
-
-    /**
-     * 商品品名
-     */
-    private String descripitionName;
+    private String userId;
     /**
      * 创建时间
      */
@@ -58,26 +57,19 @@ public class TbCfPlatformOrderEntity implements Serializable {
     /**
      * 实际付款
      */
-    private BigDecimal realPay;
+    private BigDecimal realityPay;
     /**
      * 第三方快递单号
      */
     private String pExpressNumber;
-
-
     /**
-     * 设置：商品品名
+     * 商品品名id
      */
-    public String setDescripitionName() {
-        return descripitionName;
-    }
+    private String descripitionId;
     /**
-     * 获取：商品品名
+     * 物流状态 10：无 20：有
      */
-    public String getDescripitionName() {
-        this.descripitionName = descripitionName;
-        return descripitionName;
-    }
+    private Integer logisticsStatus;
 
     /**
      * 设置：对应id
@@ -118,6 +110,19 @@ public class TbCfPlatformOrderEntity implements Serializable {
     public String getPOrderId() {
         return pOrderId;
     }
+    /**
+     * 设置：商品ID
+     */
+    public void setItemId(String itemId) {
+        this.itemId = itemId;
+    }
+
+    /**
+     * 获取：商品ID
+     */
+    public String getItemId() {
+        return itemId;
+    }
     /**
      * 设置：第三方平台名
      */
@@ -160,28 +165,28 @@ public class TbCfPlatformOrderEntity implements Serializable {
     /**
      * 设置：代购人
      */
-    public void setAgentName(String agentName) {
-        this.agentName = agentName;
+    public void setUserName(String userName) {
+        this.userName = userName;
     }
 
     /**
      * 获取：代购人
      */
-    public String getAgentName() {
-        return agentName;
+    public String getUserName() {
+        return userName;
     }
     /**
      * 设置：代购人id
      */
-    public void setAgentId(String agentId) {
-        this.agentId = agentId;
+    public void setUserId(String userId) {
+        this.userId = userId;
     }
 
     /**
      * 获取：代购人id
      */
-    public String getAgentId() {
-        return agentId;
+    public String getUserId() {
+        return userId;
     }
     /**
      * 设置：创建时间
@@ -199,15 +204,15 @@ public class TbCfPlatformOrderEntity implements Serializable {
     /**
      * 设置：实际付款
      */
-    public void setRealPay(BigDecimal realPay) {
-        this.realPay = realPay;
+    public void setRealityPay(BigDecimal realityPay) {
+        this.realityPay = realityPay;
     }
 
     /**
      * 获取：实际付款
      */
-    public BigDecimal getRealPay() {
-        return realPay;
+    public BigDecimal getRealityPay() {
+        return realityPay;
     }
     /**
      * 设置：第三方快递单号
@@ -222,5 +227,30 @@ public class TbCfPlatformOrderEntity implements Serializable {
     public String getPExpressNumber() {
         return pExpressNumber;
     }
+    /**
+     * 设置：商品品名id
+     */
+    public void setDescripitionId(String descripitionId) {
+        this.descripitionId = descripitionId;
+    }
+
+    /**
+     * 获取：商品品名id
+     */
+    public String getDescripitionId() {
+        return descripitionId;
+    }
+    /**
+     * 设置：物流状态 10：无 20：有
+     */
+    public void setLogisticsStatus(Integer logisticsStatus) {
+        this.logisticsStatus = logisticsStatus;
+    }
 
+    /**
+     * 获取：物流状态 10：无 20：有
+     */
+    public Integer getLogisticsStatus() {
+        return logisticsStatus;
+    }
 }

platform-admin/src/main/java/com/platform/service/impl/TbCfOrderServiceImpl.java

@@ -98,6 +98,7 @@ public class TbCfOrderServiceImpl implements TbCfOrderService {
             tbCfPlatformOrder.setUserName(sysUserDao.queryById(userId));
             res = tbCfPlatformOrderDao.updates(tbCfPlatformOrder);
         } else {
+            tbCfPlatformOrder.setLogisticsStatus(10);
             tbCfPlatformOrder.setRelativeId(tbCfPlatformOrder.getOrdersId());
             tbCfPlatformOrder.setOrderId(tbCfItemOrderRDao.getOrderId(tbCfPlatformOrder.getOrdersId()));
             tbCfPlatformOrder.setCreateTime(new Date());

platform-admin/src/main/java/com/platform/vo/PlatformOrderVo.java

@@ -52,6 +52,19 @@ public class PlatformOrderVo implements  Serializable{
      */
     private String pExpressNumber;
 
+    /**
+     * 物流状态 10：无 20：有
+     */
+    private Integer logisticsStatus;
+
+    public Integer getLogisticsStatus() {
+        return logisticsStatus;
+    }
+
+    public void setLogisticsStatus(Integer logisticsStatus) {
+        this.logisticsStatus = logisticsStatus;
+    }
+
     private String userId;
 
     private String userName;

platform-admin/src/main/resources/dev/platform.properties

@@ -2,13 +2,13 @@
 #jdbc.username=root
 #jdbc.password=root
 
-#jdbc.url=jdbc:mysql://47.106.242.175:3306/chinafrica?allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8
-#jdbc.username=root
-#jdbc.password=diaoyun666
+jdbc.url=jdbc:mysql://47.106.242.175:3306/chinafrica?allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8
+jdbc.username=root
+jdbc.password=diaoyun666
 
-jdbc.url: jdbc:mysql://159.138.48.71:3306/chinafrica?useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull&useSSL=false
-jdbc.username: root
-jdbc.password: Diaoyunnuli.8
+#jdbc.url: jdbc:mysql://159.138.48.71:3306/chinafrica?useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull&useSSL=false
+#jdbc.username: root
+#jdbc.password: Diaoyunnuli.8
 
 jdbc.initialSize=5
 jdbc.maxActive=30

platform-admin/src/main/resources/prod/platform.properties

@@ -2,13 +2,13 @@
 #jdbc.username=root
 #jdbc.password=root
 
-#jdbc.url=jdbc:mysql://47.106.242.175:3306/chinafrica?allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8
-#jdbc.username=root
-#jdbc.password=diaoyun666
+jdbc.url=jdbc:mysql://47.106.242.175:3306/chinafrica?allowMultiQueries=true&useSSL=false&useUnicode=true&characterEncoding=UTF-8
+jdbc.username=root
+jdbc.password=diaoyun666
 
-jdbc.url: jdbc:mysql://159.138.48.71:3306/chinafrica?useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull&useSSL=false
-jdbc.username: root
-jdbc.password: Diaoyunnuli.8
+#jdbc.url: jdbc:mysql://159.138.48.71:3306/chinafrica?useUnicode=true&characterEncoding=UTF-8&rewriteBatchedStatements=true&autoReconnect=true&failOverReadOnly=false&zeroDateTimeBehavior=convertToNull&useSSL=false
+#jdbc.username: root
+#jdbc.password: Diaoyunnuli.8
 
 jdbc.initialSize=5
 jdbc.maxActive=30