超级会员优惠商品2

src/main/java/com/caimei/modules/product/entity/Product.java

@@ -182,6 +182,8 @@ public class Product extends DataEntity<Product> {
     private Integer trainingMethod; //仪器培训方式：1线上培训，2线下培训
     private Integer trainingType; //售价是否包含：1售价未包含，2售价已包含
     private BigDecimal trainingFee; //培训费用(售价未包含)
+    private Integer svipFlag;	//超级会员商品标识：1是，2不是
+
 
 
     //以下参数是搜索回显参数
@@ -1881,4 +1883,12 @@ public class Product extends DataEntity<Product> {
     public void setTrainingFee(BigDecimal trainingFee) {
         this.trainingFee = trainingFee;
     }
+
+    public Integer getSvipFlag() {
+        return svipFlag;
+    }
+
+    public void setSvipFlag(Integer svipFlag) {
+        this.svipFlag = svipFlag;
+    }
 }

src/main/resources/mappings/modules/order/CmRefundShopMapper.xml

@@ -170,10 +170,26 @@
 	</update>
 
 	<select id="findByRefundShopId" resultType="com.caimei.modules.order.entity.CmRefundShop">
-		SELECT
+		<!--SELECT
 		<include refid="cmRefundShopColumns"/>
 		FROM cm_refund_shop a
 		<include refid="cmRefundShopJoins"/>
-		WHERE a.id = #{refundShopId}
+		WHERE a.id = #{refundShopId}-->
+		SELECT DISTINCT
+		cfs.id AS '退款记录ID',
+		s.name AS '供应商',
+		concat((cfs.refundAmount+cfs.refundBalanceAmount),if(crsr.recordRefundType = '5','（退差价）','') as '退款金额',
+		group_concat(crsr.shopOrderNo, '(', crsr.shopOrderID, ')') as '子订单编号',
+		group_concat(cso.orderNo, '(', cso.orderID, ')') as '订单编号',
+		u.`name` as '记录人',
+		cfs.operatTime as '记录时间'
+		FROM cm_refund_shop cfs
+		LEFT JOIN cm_refund_shop_record crsr ON crsr.refundShopID = cfs.id
+		left join cm_shop_order cso on cso.shopOrderID = crsr.shopOrderID
+		left join shop s on s.shopID = cfs.shopID
+		left join sys_user u on u.id = cfs.operator
+		where cfs.delFlag='0'
+		group by cfs.id
+		ORDER BY cfs.operatTime desc;
 	</select>
 </mapper>

src/main/resources/mappings/modules/product/CmPromotionMapper.xml

@@ -192,6 +192,7 @@
                     </if>
                 </where>
                 )
+                AND p.productID NOT IN (select productId from cm_svip_product)
             </if>
         </where>
     </select>

src/main/resources/mappings/modules/product/ProductNewMapper.xml

@@ -159,13 +159,15 @@
 		cshd.publisher AS "publisher",
 		cshd.source AS "source",
 		cshd.dockingPeopleName AS "dockingPeopleName",
-        cb.name as "brandName"
+        cb.name as "brandName",
+        if(csp.id is not null,1,0) as "svipFlag"
     </sql>
 
     <sql id="productJoins">
         LEFT JOIN shop s ON s.shopID = a.shopID
         LEFT JOIN cm_second_hand_detail cshd ON cshd.productID = a.productID
         LEFT JOIN cm_brand cb ON a.brandID = cb.id
+        LEFT JOIN cm_svip_product csp on a.productID = csp.productId
     </sql>
     <sql id="ActivityJoins">
         LEFT JOIN shop s on s.shopID = a.shopID

src/main/webapp/WEB-INF/views/modules/product-new/productEdit.jsp

@@ -727,14 +727,20 @@
     // 是否使用阶梯价格
     function changeLadderPrice(){
         var ladderPriceFlag = $("input[name='ladderPriceFlag']:checked").val();
-        if(ladderPriceFlag*1>0){
-            $("#ladderPriceBox").show();
-            $("#priceMinNumber").hide();
-            $("#delFlag1").val("0");
-            $('input[name="ladderPriceList[0].buyNum"]').val($('#minBuyNumber').val()*1);
+        var svipFlag = ${product.svipFlag};
+        if (svipFlag == 1) {
+            alertx("超级会员优惠商品不能设置阶梯价格，请先取消优惠后再设置");
+            $("input[name='ladderPriceFlag']").get(0).checked=true;
         }else{
-            $("#ladderPriceBox").hide();
-            $("#priceMinNumber").show();
+            if(ladderPriceFlag*1>0){
+                $("#ladderPriceBox").show();
+                $("#priceMinNumber").hide();
+                $("#delFlag1").val("0");
+                $('input[name="ladderPriceList[0].buyNum"]').val($('#minBuyNumber').val()*1);
+            }else{
+                $("#ladderPriceBox").hide();
+                $("#priceMinNumber").show();
+            }
         }
     }
     // 是否固定成本