修改订单状态，修改第三方已发货订单

src/main/resources/mapper/TbCfOrderDao.xml

@@ -252,7 +252,6 @@
 	<!--获取用户订单数据-->
 	<select id="getUserOrderList" resultType="com.diaoyun.zion.chinafrica.entity.TbCfOrderEntity">
 		select
-		DISTINCT
 		o.order_id,
 		o.order_no,
 		o.order_name,
@@ -279,9 +278,8 @@
 		o.enable_flag,
 		o.descripition_name
 		from tb_cf_order o
-		left join tb_cf_item_order_r r on o.order_id=r.order_id
 		where  o.user_id=#{userId}  and o.enable_flag=1
-		<if test="orderStatus  != null">and r.order_status = #{orderStatus}</if>
+		<if test="orderStatus  != null">and o.order_status = #{orderStatus}</if>
 		order by o.order_time desc
 	</select>
 	<select id="getOrdersId"  resultType="String">
@@ -326,8 +324,7 @@
 
 	<!--获取某段时间已发货订单数据-->
 	<select id="getDeliveryList" resultType="com.diaoyun.zion.chinafrica.entity.TbCfItemShippedEntity">
-		select
-		DISTINCT
+			select
 		o.user_id,
 		r.order_item_id order_id,
 		p.create_time deliveryTime,
@@ -342,8 +339,7 @@
 		LEFT JOIN tb_cf_platform_order p on r.order_item_id=p.relative_id
 		LEFT JOIN tb_cf_item_detail i on r.item_id=i.item_id
 		LEFT JOIN tb_cf_address a on a.user_id=o.user_id
-		where r.delivery_flag=10  and r.enable_flag=1
+		where r.delivery_flag=10 and r.enable_flag=1 and o.order_status=40
 		and p.create_time <![CDATA[ >= ]]> #{beginDate} and p.create_time <![CDATA[ < ]]> #{endDate}
 	</select>
-
 </mapper>
\ No newline at end of file

src/main/resources/properties/domain.properties

@@ -72,12 +72,12 @@ paypal.client.secret=EIyDryMDyM0BDWp2mtuGFdSU2WOkWtmSuGGaRnUiIom7kxuM7JhuSFfETbC
 #flutterwave.encryption.key=38ec6860f49e0d9d488a83b1
 #flutterwave.merchant.id=3950728
 #################################flutterwave真实(miumiu@afrieshop.com)######################################################
-flutterwave.public.key=FLWPUBK-ee0f5d653f5f33fc89e6caf9de6a4c34-X
-flutterwave.secret.key=FLWSECK-c06cdc19526077f3855b76045ca77de3-X
-flutterwave.encryption.key=c06cdc1952600626ec8779ed
-flutterwave.merchant.id=6577084
+#flutterwave.public.key=FLWPUBK-ee0f5d653f5f33fc89e6caf9de6a4c34-X
+#flutterwave.secret.key=FLWSECK-c06cdc19526077f3855b76045ca77de3-X
+#flutterwave.encryption.key=c06cdc1952600626ec8779ed
+#flutterwave.merchant.id=6577084
 #################################flutterwave测试(TEST)######################################################
-#flutterwave.public.key=FLWPUBK_TEST-e3cc948e7cb24b2128fca3b781f6fce0-X
-#flutterwave.secret.key=FLWSECK_TEST-f88371ca63a989a4af95625475a0d22d-X
-#flutterwave.encryption.key=FLWSECK_TEST001d4c34f798
-#flutterwave.merchant.id=1508207
+flutterwave.public.key=FLWPUBK_TEST-e3cc948e7cb24b2128fca3b781f6fce0-X
+flutterwave.secret.key=FLWSECK_TEST-f88371ca63a989a4af95625475a0d22d-X
+flutterwave.encryption.key=FLWSECK_TEST001d4c34f798
+flutterwave.merchant.id=1508207