Merge remote-tracking branch 'origin/master'

wisenergy-mapper/src/main/java/cn/wisenergy/mapper/OrderMapper.java

@@ -18,4 +18,17 @@ public interface OrderMapper extends BaseMapper<OrderInfo> {
      * @return 订单列表
      */
     List<OrderInfo> getByRebateStatus(@Param("rebateStatus") Integer rebateStatus);
+
+    /**
+     * 有赞订单数据插入
+     */
+    void insertYouZanOrders(OrderInfo orderInfo);
+
+    /**
+     * 根据tid获取订单数据
+     * @param tid 有赞生成的订单id
+     * @return 一条订单数据
+     */
+    OrderInfo getByTid(@Param("tid")String tid);
+
 }

wisenergy-mapper/src/main/resources/mapper/OrderMapper.xml

@@ -95,4 +95,22 @@
         </where>
     </select>
 
+    <insert id="insertYouZanOrders" parameterType="cn.wisenergy.model.app.OrderInfo" keyProperty="id" useGeneratedKeys="true">
+        insert into
+        <include refid="table"/>
+        (<include refid="cols_exclude_id"/>)
+        value
+        (<include refid="vals"/>)
+    </insert>
+
+    <select id="getByTid" resultType="cn.wisenergy.model.app.OrderInfo">
+        SELECT
+        <include refid="cols_all"/>
+        from
+        <include refid="table"/>
+        <where>
+            tid=#{tid}
+        </where>
+    </select>
+
 </mapper>
\ No newline at end of file

wisenergy-model/src/main/java/cn/wisenergy/model/app/OrderInfo.java

@@ -85,13 +85,13 @@ public class OrderInfo {
      * 订单关闭类型
      */
     @ApiModelProperty(name = "closeType", value = "订单关闭类型")
-    private Date closeType;
+    private Integer closeType;
 
     /**
      * 退款状态
      */
     @ApiModelProperty(name = "refundState  ", value = "退款状态")
-    private Boolean refundState;
+    private Long refundState;
 
     /**
      * 交易完成时间

wisenergy-service/pom.xml

@@ -72,6 +72,28 @@
             <artifactId>itext-asian</artifactId>
             <version>5.2.0</version>
         </dependency>
+
+        <!--有赞SDK-->
+        <dependency>
+            <groupId>com.youzan.cloud</groupId>
+            <artifactId>open-sdk-core</artifactId>
+            <version>1.0.7-RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>com.youzan.cloud</groupId>
+            <artifactId>open-sdk-gen</artifactId>
+            <version>1.0.7.78771202102051104-RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>com.youzan.cloud</groupId>
+            <artifactId>open-sdk-api</artifactId>
+            <version>1.0.7-RELEASE</version>
+        </dependency>
+        <dependency>
+            <groupId>com.youzan.cloud</groupId>
+            <artifactId>open-sdk-common</artifactId>
+            <version>1.0.7-RELEASE</version>
+        </dependency>
     </dependencies>
 
     <!-- MAVEN构建 -->

wisenergy-service/src/main/java/cn/wisenergy/service/app/OrderService.java

 package cn.wisenergy.service.app;
 
+import com.youzan.cloud.open.sdk.common.exception.SDKException;
+import com.youzan.cloud.open.sdk.gen.v4_0_0.model.YouzanTradesSoldGetResult;
+
 /**
 *@ Description: 订单接口定义
 *@ Author     : 86187
@@ -7,4 +10,7 @@ package cn.wisenergy.service.app;
  * @author 86187
  */
 public interface OrderService {
+    void getYouZanOrdersForCreateTime() throws SDKException;
+
+    void getYouZanOrdersForUpdateTime() throws SDKException;
 }