|
|
@@ -39,7 +39,7 @@
|
|
|
shopPostFlag,
|
|
|
shopTaxFee, confirmTime,
|
|
|
shouldPayShopAmount, orderTime, orderSubmitType, splitFlag, payStatus,
|
|
|
- payedShopAmount, splitCode, realPay, eachDiscount, receiptStatus)
|
|
|
+ payedShopAmount, splitCode, realPay, eachDiscount, receiptStatus, cmAccountType)
|
|
|
VALUES (#{onlinePayWays}, #{shopOrderNo}, #{orderId}, #{orderNo}, #{organizeId}, #{isColdChina}, #{shopId},
|
|
|
#{note}, #{userId}, #{clubId}, #{orderType},
|
|
|
#{spId}, #{orderPromotionsId}, #{promotionFullReduction}, #{svipShopReduction}, #{brokerage},
|
|
|
@@ -47,7 +47,8 @@
|
|
|
#{totalAmount}, #{productAmount}, #{needPayAmount}, #{shopProductAmount}, #{shopPostFee},
|
|
|
#{shopPostFlag}, #{shopTaxFee}, #{confirmTime},
|
|
|
#{shouldPayShopAmount}, #{orderTime}, #{orderSubmitType}, #{splitFlag}, #{payStatus},
|
|
|
- #{payedShopAmount}, #{splitCode}, #{realPay}, #{eachDiscount}, 1)
|
|
|
+ #{payedShopAmount}, #{splitCode}, #{realPay}, #{eachDiscount}, 1,
|
|
|
+ (select cmAccountType from shop where shopId = #{shopId}))
|
|
|
</insert>
|
|
|
<update id="updateOrder">
|
|
|
update cm_order
|
|
|
@@ -223,52 +224,54 @@
|
|
|
WHERE userID = #{userId}
|
|
|
</select>
|
|
|
<select id="getProductDetails" resultType="com.caimei365.order.model.po.OrderProductPo">
|
|
|
- SELECT cs.skuId AS skuId,
|
|
|
- p.productID AS productId,
|
|
|
- p.shopID AS shopId,
|
|
|
- p.`name` AS `name`,
|
|
|
- p.mainImage AS image,
|
|
|
+ SELECT cs.skuId AS skuId,
|
|
|
+ p.productID AS productId,
|
|
|
+ p.shopID AS shopId,
|
|
|
+ p.`name` AS `name`,
|
|
|
+ p.mainImage AS image,
|
|
|
cs.price,
|
|
|
cs.costPrice,
|
|
|
IFNULL((SELECT costCheckFlag
|
|
|
FROM cm_organize_product_info
|
|
|
- WHERE productId = cs.productId AND organizeId = cs.organizeId), 1) AS costCheckFlag,
|
|
|
- cs.shopPercent as costProportional,
|
|
|
+ WHERE productId = cs.productId
|
|
|
+ AND organizeId = cs.organizeId), 1) AS costCheckFlag,
|
|
|
+ cs.shopPercent as costProportional,
|
|
|
p.productCategory,
|
|
|
cs.ladderPriceFlag,
|
|
|
p.includedTax,
|
|
|
p.invoiceType,
|
|
|
- p.taxPoint AS taxRate,
|
|
|
- cs.unit AS productUnit,
|
|
|
+ p.taxPoint AS taxRate,
|
|
|
+ cs.unit AS productUnit,
|
|
|
cs.normalPrice,
|
|
|
- p.supplierTaxPoint AS shopTaxRate,
|
|
|
- p.splitCode as splitCode
|
|
|
+ p.supplierTaxPoint AS shopTaxRate,
|
|
|
+ p.splitCode as splitCode
|
|
|
FROM product p
|
|
|
LEFT JOIN cm_sku cs on p.productID = cs.productId
|
|
|
WHERE cs.skuId = #{skuId}
|
|
|
and cs.organizeId = 0
|
|
|
</select>
|
|
|
<select id="getProductOrganizeDetails" resultType="com.caimei365.order.model.po.OrderProductPo">
|
|
|
- SELECT cs.skuId AS skuId,
|
|
|
- p.productID AS productId,
|
|
|
- p.shopID AS shopId,
|
|
|
- p.`name` AS `name`,
|
|
|
- p.mainImage AS image,
|
|
|
+ SELECT cs.skuId AS skuId,
|
|
|
+ p.productID AS productId,
|
|
|
+ p.shopID AS shopId,
|
|
|
+ p.`name` AS `name`,
|
|
|
+ p.mainImage AS image,
|
|
|
cs.price,
|
|
|
cs.costPrice,
|
|
|
IFNULL((SELECT costCheckFlag
|
|
|
FROM cm_organize_product_info
|
|
|
- WHERE productId = cs.productId AND organizeId = cs.organizeId), 1) AS costCheckFlag,
|
|
|
- cs.shopPercent as costProportional,
|
|
|
+ WHERE productId = cs.productId
|
|
|
+ AND organizeId = cs.organizeId), 1) AS costCheckFlag,
|
|
|
+ cs.shopPercent as costProportional,
|
|
|
p.productCategory,
|
|
|
cs.ladderPriceFlag,
|
|
|
p.includedTax,
|
|
|
p.invoiceType,
|
|
|
- p.taxPoint AS taxRate,
|
|
|
- cs.unit AS productUnit,
|
|
|
+ p.taxPoint AS taxRate,
|
|
|
+ cs.unit AS productUnit,
|
|
|
cs.normalPrice,
|
|
|
- p.supplierTaxPoint AS shopTaxRate,
|
|
|
- p.splitCode as splitCode
|
|
|
+ p.supplierTaxPoint AS shopTaxRate,
|
|
|
+ p.splitCode as splitCode
|
|
|
FROM product p
|
|
|
LEFT JOIN cm_sku cs on p.productID = cs.productId
|
|
|
WHERE cs.skuId = #{skuId}
|
|
|
@@ -343,26 +346,27 @@
|
|
|
AND (splitcode IS NULL OR splitcode ='')
|
|
|
</select>
|
|
|
<select id="getRechargeProductDetails" resultType="com.caimei365.order.model.po.OrderProductPo">
|
|
|
- SELECT cs.skuId AS skuId,
|
|
|
- p.productID AS productId,
|
|
|
- p.shopID AS shopId,
|
|
|
- p.`name` AS `name`,
|
|
|
- p.mainImage AS image,
|
|
|
+ SELECT cs.skuId AS skuId,
|
|
|
+ p.productID AS productId,
|
|
|
+ p.shopID AS shopId,
|
|
|
+ p.`name` AS `name`,
|
|
|
+ p.mainImage AS image,
|
|
|
cs.price,
|
|
|
cs.costPrice,
|
|
|
IFNULL((SELECT costCheckFlag
|
|
|
FROM cm_organize_product_info
|
|
|
- WHERE productId = cs.productId AND organizeId = cs.organizeId), 1) AS costCheckFlag,
|
|
|
- cs.shopPercent as costProportional,
|
|
|
+ WHERE productId = cs.productId
|
|
|
+ AND organizeId = cs.organizeId), 1) AS costCheckFlag,
|
|
|
+ cs.shopPercent as costProportional,
|
|
|
p.productCategory,
|
|
|
cs.ladderPriceFlag,
|
|
|
p.includedTax,
|
|
|
p.invoiceType,
|
|
|
- p.taxPoint AS taxRate,
|
|
|
- cs.unit AS productUnit,
|
|
|
+ p.taxPoint AS taxRate,
|
|
|
+ cs.unit AS productUnit,
|
|
|
cs.normalPrice,
|
|
|
- p.supplierTaxPoint AS shopTaxRate,
|
|
|
- p.splitCode as splitCode
|
|
|
+ p.supplierTaxPoint AS shopTaxRate,
|
|
|
+ p.splitCode as splitCode
|
|
|
FROM product p
|
|
|
LEFT JOIN cm_sku cs on p.productID = cs.productId
|
|
|
WHERE cs.productId = #{productId}
|
zhijiezhao