菠萝派xml提交

tooth-wechat-service/src/main/java/com/iamberry/wechat/service/mapper/adminOrderMapper.xml

@@ -701,33 +701,67 @@
 			date_format(o.sales_create_date,'%Y-%m')
 	</select>
 
+
+	<!--  菠萝派接口调用，其他接口请勿使用 - stast -->
+	<select id="selectShopOrderByPolaById" parameterType="String" resultType="Order">
+		SELECT
+			O.SALES_ORDERID salesOrderid,
+			O.sales_openid salesOpenid,
+			O.SALES_ADDRESS_NAME salesAddressName,
+			U.USER_NICKNAME userNickname,
+			O.SALES_ADDRESS_TEL salesAddressTel,
+			O.SALES_AMOUNT salesAmount,
+			O.SALES_RATE_AMOUNT salesRateAmount,
+			O.SALES_INTEGRAL_NUM salesIntegralNum,
+			O.SALES_YET_AMOUNT salesYetAmount,
+			O.SALES_STATUS salesStatus,
+			O.SALES_CREATE_DATE salesCreateDate,
+			O.SALES_POST_NUM salesPostNum,
+			O.SALES_POST_FIRM salesPostFirm,
+			O.SALES_ADMIN_REMARK salesAdminRemark,
+			O.SALES_COLOR_TYPE salesColorType,
+			O.SALES_USER_REMARK salesUserRemark,
+			O.SALES_IS_RFUND salesIsRfund,
+			O.sales_transaction_date salesTransactionDate,
+			O.sales_address_info salesAddressInfo,
+			O.sales_address_postnum salesAddressPostnum,
+			O.sales_return_des salesReturnDes,
+			U.USER_RES_TYPE userResource
+		FROM
+			TB_IAMBERRY_SHOP_SALES_ORDER O
+		LEFT JOIN TB_IAMBERRY_USER_USERINFO U ON O.SALES_OPENID = U.USER_OPENID
+		WHERE
+			O.SALES_ORDERID = #{salesOrderid}
+	</select>
+
 	<select id="selectShopOrderByPola" parameterType="Order" resultType="Order">
 		SELECT
-		O.SALES_ORDERID salesOrderid,
-		O.SALES_ADDRESS_NAME salesAddressName,
-		U.USER_NICKNAME userNickname,
-		O.SALES_ADDRESS_TEL salesAddressTel,
-		O.SALES_AMOUNT salesAmount,
-		O.SALES_RATE_AMOUNT salesRateAmount,
-		O.SALES_INTEGRAL_NUM salesIntegralNum,
-		O.SALES_YET_AMOUNT salesYetAmount,
-		O.SALES_STATUS salesStatus,
-		O.SALES_CREATE_DATE salesCreateDate,
-		O.SALES_POST_NUM salesPostNum,
-		O.SALES_POST_FIRM salesPostFirm,
-		O.SALES_ADMIN_REMARK salesAdminRemark,
-		O.SALES_COLOR_TYPE salesColorType,
-		O.SALES_USER_REMARK salesUserRemark,
-		O.SALES_IS_RFUND salesIsRfund,
-		O.sales_transaction_date salesTransactionDate,
-		O.sales_address_info salesAddressInfo,
-		O.sales_address_postnum salesAddressPostnum,
-		U.USER_RES_TYPE userResource
+			O.SALES_ORDERID salesOrderid,
+			O.SALES_ADDRESS_NAME salesAddressName,
+			U.USER_NICKNAME userNickname,
+			O.SALES_ADDRESS_TEL salesAddressTel,
+			O.SALES_AMOUNT salesAmount,
+			O.SALES_RATE_AMOUNT salesRateAmount,
+			O.SALES_INTEGRAL_NUM salesIntegralNum,
+			O.SALES_YET_AMOUNT salesYetAmount,
+			O.SALES_STATUS salesStatus,
+			O.SALES_CREATE_DATE salesCreateDate,
+			O.SALES_POST_NUM salesPostNum,
+			O.SALES_POST_FIRM salesPostFirm,
+			O.SALES_ADMIN_REMARK salesAdminRemark,
+			O.SALES_COLOR_TYPE salesColorType,
+			O.SALES_USER_REMARK salesUserRemark,
+			O.SALES_IS_RFUND salesIsRfund,
+			O.sales_transaction_date salesTransactionDate,
+			O.sales_address_info salesAddressInfo,
+			O.sales_address_postnum salesAddressPostnum,
+		    O.sales_return_des salesReturnDes,
+			U.USER_RES_TYPE userResource
 		FROM
-		TB_IAMBERRY_SHOP_SALES_ORDER O
+			TB_IAMBERRY_SHOP_SALES_ORDER O
 		LEFT JOIN TB_IAMBERRY_USER_USERINFO U ON O.SALES_OPENID = U.USER_OPENID
 		WHERE
-		O.SALES_ORDER_TYPE = 1
+			O.SALES_ORDER_TYPE = 1
 		AND O.SALES_STATUS !=  1
 		AND O.SALES_STATUS !=  0
 		<if test="salesStatus != null and salesStatus != -1">
@@ -736,10 +770,10 @@
 		<if test="salesOrderid != null and salesOrderid!=''">
 			AND O.SALES_ORDERID = #{salesOrderid}
 		</if>
-		<if test="beginDate != null and beginDate!=''">
+		<if test="beginDate != null and beginDate!='' and selectDateType == 2">
 			AND O.sales_create_date &gt;= #{beginDate}
 		</if>
-		<if test="endDate != null and endDate!=''">
+		<if test="endDate != null and endDate!='' and selectDateType == 2">
 			AND O.sales_create_date &lt;= #{endDate}
 		</if>
 		ORDER BY O.SALES_CREATE_DATE DESC
@@ -752,7 +786,7 @@
 		I.item_id itemId,
 		I.ITEM_PRODUCT_NAME itemProductName, I.ITEM_PRODUCT_PIC itemProductPic, I.ITEM_PRODUCT_PRICE itemProductPrice,
 		I.ITEM_PRODUCT_DISCOUNT itemProductDiscount, I.ITEM_NUM itemNum, I.ITEM_TOTAL itemTotal, C.COLOR_NAME productColor,
-		C.COLOR_69CODE produectRemark, I.ITEM_PRODUCT_TYPE itemProductType
+		C.COLOR_69CODE produectRemark, C.COLOR_POLY_CODE colorPolyCode, I.ITEM_PRODUCT_TYPE itemProductType
 		FROM
 		TB_IAMBERRY_SHOP_ORDER_ITEM I LEFT JOIN TB_IAMBERRY_PRODUCT_INFO P
 		ON I.ITEM_PRODUCT_ID = P.PRODUCT_ID
@@ -761,6 +795,7 @@
 		ITEM_SALES_ORDERID = #{0}
 		ORDER BY ITEM_ID DESC
 	</select>
+	<!--  菠萝派接口调用，其他接口请勿使用 - end -->
 
 	<select id="selectNumberBacklog" resultType="NumberBacklogDto">
 		SELECT