v1_0_2

pom.xml

@@ -21,6 +21,11 @@
     </parent>
 
     <dependencies>
+        <dependency>
+            <groupId>io.swagger</groupId>
+            <artifactId>swagger-annotations</artifactId>
+            <version>1.6.2</version>
+        </dependency>
         <dependency>
             <groupId>com.squareup.okhttp3</groupId>
             <artifactId>okhttp</artifactId>

src/main/java/com/caimei/CaimeiMallAdminApplication.java

@@ -8,7 +8,6 @@ import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.EnableMBeanExport;
 import org.springframework.context.annotation.Import;
 import org.springframework.jmx.support.RegistrationPolicy;
-import springfox.documentation.swagger2.annotations.EnableSwagger2;
 
 import javax.servlet.MultipartConfigElement;
 

src/main/java/com/caimei/modules/order/entity/NewOrder.java

@@ -218,6 +218,12 @@ public class NewOrder implements Serializable {
      */
     @ApiModelProperty("展示字段：能否更改收款状态 1可以 0不可以")
     private Integer checkFlag;
+    /**
+     * 当主订单为【待收款】或者为线下支付的【部分收款】状态时，才显示更改订单状态按钮
+     * （排除交易全退订单）
+     */
+    @ApiModelProperty("1WWW、2CRM、3APP[历史数据]、4客服、5外单、6小程序[采美,星范等]")
+    private Integer orderSource;
 
     @ApiModelProperty("退款信息")
     private CmReturnedPurchase cmReturnedPurchase;

src/main/resources/config/dev/application-dev.yml

@@ -12,6 +12,9 @@ spring:
     #数据源连接--start
   datasource:
     driverClassName: com.mysql.jdbc.Driver
+#    url: jdbc:mysql://192.168.2.100:3306/caimei?characterEncoding=UTF8&serverTimezone=Asia/Shanghai
+#    username: developer
+#    password: 05bZ/OxTB:X+yd%1
     url: jdbc:mysql://120.79.25.27:3306/caimei?characterEncoding=UTF8&serverTimezone=Asia/Shanghai
     username: developer
     password: J5p3tgOVazNl4ydf

src/main/resources/mapper/CmDiscernReceiptMapper.xml

@@ -70,9 +70,8 @@
         LEFT JOIN cm_offline_collection cof ON a.payType = cof.type
         <where>
             crr.relationType = 1
-            <if test="organizeId != null">
-                AND cr.organizeId = #{organizeId}
-            </if>
+            AND cr.organizeId = #{organizeId}
+
             <if test="receiptId != null">
                 AND a.id = #{receiptId}
             </if>
@@ -281,4 +280,4 @@
         from cm_offline_collection
         where organizeId = 4
     </select>
-</mapper>
+</mapper>

src/main/resources/mapper/NewOrderMapper.xml

@@ -291,6 +291,7 @@
         "shouldPayProduct",
         co.status AS status,
         co.postageOrderFlag AS postageOrderFlag,
+        co.orderSource AS orderSource,
         c.name as clubName,
         (SELECT IF(COUNT(orderId)>0,1,0) FROM cm_returned_purchase
         WHERE STATUS = 1
@@ -301,15 +302,15 @@
         left join cm_order_product cop on co.orderID = cop.orderID
         left join club c on co.userId = c.userId
         <where>
+            co.organizeId = #{organizeId}
+
             <if test="orderId != null">
                 AND co.orderId = #{orderId}
             </if>
             <if test="orderNo != null and orderNo != ''">
                 AND co.orderNo = #{orderNo}
             </if>
-            <if test="organizeId != null">
-                AND co.organizeId = #{organizeId}
-            </if>
+
             <if test="status != null and status != ''">
                 <choose>
                     <when test="status == '99'.toString()">