bugfix

src/main/java/com/caimei/modules/weisha/service/CmOrganizeProductService.java

@@ -50,7 +50,7 @@ public class CmOrganizeProductService extends CrudService<CmOrganizeProductDao,
 			//若为不含税，则成本为：（售价+售价*机构税率）*比例
 			//若为未知，则成本为：售价*比例
 			if (2 == product.getCostType()) {
-				if (0 == product.getIncludedTax()) {
+				if (0 == product.getIncludedTax() && 3 != product.getInvoiceType()) {
 					product.setCostPrice((product.getPrice()+product.getPrice()*product.getClubTaxPoint()*0.01)*product.getCostProportional()*0.01);
 				} else {
 					product.setCostPrice(product.getPrice()*product.getCostProportional());

src/main/resources/mappings/modules/weisha/CmOrganizeProductMapper.xml

@@ -100,6 +100,7 @@
 				 left join cm_organize_product cop on p.productID = cop.productId and cop.organizeId = #{organizeId} and cop.delFlag = 0
 				 left join shop s on p.shopID = s.shopID
 		<where>
+		 	p.productCategory = 1
 			<if test="productID != null">
 				AND p.productID = #{productID}
 			</if>