Kaynağa Gözat

Merge remote-tracking branch 'origin/developer' into developerD

huangzhiguo 1 yıl önce
ebeveyn
işleme
9836b757e8

+ 43 - 30
src/main/resources/mapper/PageMapper.xml

@@ -114,29 +114,8 @@
         order by -sort desc, createDate desc
     </select>
     <select id="getFloorContentByCentreId" resultType="com.caimei365.commodity.model.vo.FloorContentVo">
-        select id,
-               floorId,
-               centreId,
-               templateType,
-               pcAdsImage1,
-               pcAdsImage2,
-               pcAdsImage3,
-               pcAdsImage4,
-               pcAdsImage5,
-               appletsAdsImage1,
-               appletsAdsImage2,
-               appletsAdsImage3,
-               appletsAdsImage4,
-               appletsAdsImage5,
-               adsLink1,
-               adsLink2,
-               adsLink3,
-               adsLink4,
-               adsLink5,
-               displayDate1,
-               displayDate2,
-               displayDate3
-        from new_page_floor_content
+        select a.*
+        from new_page_floor_content a
         where centreId = #{id}
     </select>
     <select id="getFloorImageByCentreId" resultType="com.caimei365.commodity.model.vo.FloorImageVo">
@@ -1499,13 +1478,47 @@
     </insert>
 
     <insert id="insertreference">
-        insert into cm_baike_reference_info(referenceType, website, articleName, websiteName, publishTime,
-                                            acitationTime, author, workName, publicationPlace, press, publicationYear,
-                                            acitationWeb, referenceDescription, imageDescription, imageUrl, productId,
-                                            productType, ctrlId)
-        values (#{referenceType}, #{website}, #{articleName}, #{websiteName}, #{publishTimeStr}, #{acitationTimeStr},
-                #{author}, #{workName}, #{publicationPlace}, #{press}, #{publicationYearStr}, #{acitationWeb},
-                #{referenceDescription}, #{imageDescription}, #{imageUrl}, #{entryId}, #{entryType}, #{ctrlId})
+        insert into cm_baike_reference_info
+        <trim prefix="(" suffix=")" suffixOverrides=",">
+            <if test="referenceType != null and referenceType != ''">referenceType,</if>
+            <if test="website != null and website != ''">website,</if>
+            <if test="articleName != null and articleName != ''">articleName,</if>
+            <if test="websiteName != null and websiteName != ''">websiteName,</if>
+            <if test="publishTimeStr != null and publishTimeStr != ''">publishTime,</if>
+            <if test="acitationTimeStr != null and acitationTimeStr != ''">acitationTime,</if>
+            <if test="author != null and author != ''">author,</if>
+            <if test="workName != null and workName != ''">workName,</if>
+            <if test="publicationPlace != null and publicationPlace != ''">publicationPlace,</if>
+            <if test="press != null and press != ''">press,</if>
+            <if test="publicationYearStr != null and publicationYearStr != ''">publicationYear,</if>
+            <if test="acitationWeb != null and acitationWeb != ''">acitationWeb,</if>
+            <if test="referenceDescription != null and referenceDescription != ''">referenceDescription,</if>
+            <if test="imageDescription != null and imageDescription != ''">imageDescription,</if>
+            <if test="imageUrl != null and imageUrl != ''">imageUrl,</if>
+            <if test="entryId != null">productId,</if>
+            <if test="entryType != null and entryType != ''">productType,</if>
+            <if test="ctrlId != null and ctrlId != ''">ctrlId,</if>
+        </trim>
+        <trim prefix="values (" suffix=")" suffixOverrides=",">
+            <if test="referenceType != null and referenceType != ''">#{referenceType},</if>
+            <if test="website != null and website != ''">#{website},</if>
+            <if test="articleName != null and articleName != ''">#{articleName},</if>
+            <if test="websiteName != null and websiteName != ''">#{websiteName},</if>
+            <if test="publishTimeStr != null and publishTimeStr != ''">#{publishTimeStr},</if>
+            <if test="acitationTimeStr != null and acitationTimeStr != ''">#{acitationTimeStr},</if>
+            <if test="author != null and author != ''">#{author},</if>
+            <if test="workName != null and workName != ''">#{workName},</if>
+            <if test="publicationPlace != null and publicationPlace != ''">#{publicationPlace},</if>
+            <if test="press != null and press != ''">#{press},</if>
+            <if test="publicationYearStr != null and publicationYearStr != ''">#{publicationYearStr},</if>
+            <if test="acitationWeb != null and acitationWeb != ''">#{acitationWeb},</if>
+            <if test="referenceDescription != null and referenceDescription != ''">#{referenceDescription},</if>
+            <if test="imageDescription != null and imageDescription != ''">#{imageDescription},</if>
+            <if test="imageUrl != null and imageUrl != ''">#{imageUrl},</if>
+            <if test="entryId != null">#{entryId},</if>
+            <if test="entryType != null and entryType != ''">#{entryType},</if>
+            <if test="ctrlId != null and ctrlId != ''">#{ctrlId},</if>
+        </trim>
     </insert>
 
     <select id="getShopid" resultType="java.lang.Integer">

+ 0 - 2
src/main/resources/mapper/ShopMapper.xml

@@ -317,7 +317,6 @@
          organizeId,
          normalPrice,
          price,
-         -- costCheckFlag,
          costprice,
          stock,
          minBuyNumber,
@@ -330,7 +329,6 @@
                 #{organizeId},
                 #{normalPrice},
                 #{price},
-                -- ifnull(#{costCheckFlag}, 1),
                 #{costPrice},
                 #{stock},
                 #{minBuyNumber},