fix

Helius

2021-11-08 9c791d431038fe79a111805762ee2f42c96b51c5

 zq-erp/src/main/resources/mybatis/mapper/xcxShop/ShopOrderDetailsDao.xml

@@ -20,6 +20,8 @@
         <result property="discountExplain" column="discount_explain" />
         <result property="discountAmount" column="discount_amount" />
         <result property="payType" column="pay_type" />
         <result property="scoreCount" column="score_count" />
         <result property="totalScoreCount" column="total_score_count" />
   </resultMap>

   <!-- 定义ShopOrderDetails 的复杂map -->
@@ -39,15 +41,16 @@
         <result property="discountExplain" column="discount_explain" />
         <result property="discountAmount" column="discount_amount" />
      <result property="payType" column="pay_type" />
      <result property="scoreCount" column="score_count" />
      <result property="totalScoreCount" column="total_score_count" />

      <!--产品信息-->
      <association property="shopProduct" column="p_id"
         select="com.matrix.system.shopXcx.dao.ShopProductDao.selectById"/>
      <!--规格信息-->
      <association property="shopSku" column="s_id"
         select="com.matrix.system.shopXcx.dao.ShopSkuDao.selectById"/>
      <!--查询生产企业-->
      <association property="productionEnterprise" column="{pId=p_id}"
                select="selectProductionEnterpriseByPid"/>

   </resultMap>

   
@@ -67,7 +70,9 @@
         s_title,
         discount_explain,
         discount_amount,
         pay_type
         pay_type,
      score_count,
      total_score_count
   </sql>
   
   <!-- 属性sql -->
@@ -86,7 +91,9 @@
         #{item.sTitle},
         #{item.discountExplain},
         #{item.discountAmount},
         #{item.payType}
         #{item.payType},
         #{item.scoreCount},
         #{item.totalScoreCount}
   </sql>
   
   <!-- where sql -->
@@ -125,6 +132,14 @@
         </if>
         <if test="(record.payType!=null and record.payType!='') or  (record.payType!='' and record.payType==0)  ">
            and pay_type  = #{record.payType}
         </if>

         <if test="(record.scoreCount!=null and record.scoreCount!='') or  (record.scoreCount!='' and record.scoreCount==0)  ">
            and score_count  = #{record.scoreCount}
         </if>

         <if test="(record.totalScoreCount!=null and record.totalScoreCount!='') or  (record.totalScoreCount!='' and record.totalScoreCount==0)  ">
            and total_score_count  = #{record.totalScoreCount}
         </if>
      </if>
       
@@ -188,7 +203,20 @@
            </if>      
         <if test="_parameter.containsKey('discountAmount')">
               discount_amount = #{discountAmount},
            </if>		
            </if>

         <if test="_parameter.containsKey('payType')">
            pay_type = #{payType},
            </if>

         <if test="_parameter.containsKey('scoreCount')">
            score_count = #{scoreCount},
            </if>

         <if test="_parameter.containsKey('totalScoreCount')">
            total_score_count = #{totalScoreCount},
            </if>

      </set>
      WHERE id=#{id} 
   </update> 
@@ -225,10 +253,18 @@
         <if test="record.discountAmount != null ">
            discount_amount  = #{record.discountAmount}, 
         </if>
         <if test="record.payType != null ">
            pay_type  = #{record.payType},
         </if>
         <if test="record.scoreCount != null ">
            score_count  = #{record.scoreCount},
         </if>
         <if test="record.totalScoreCount != null ">
            total_score_count  = #{record.totalScoreCount},
         </if>
      </set>
      WHERE id=#{record.id} 
   </update>
	
   <!-- 批量删除 -->
   <delete id="deleteByIds" parameterType="java.util.List">
      delete from shop_order_details where  id in