修改积分规则，积分商品

yijia-integral/src/main/java/com/yijia/integral/service/impl/IntegralRuleServiceImpl.java

@@ -198,19 +198,23 @@ public class IntegralRuleServiceImpl implements IIntegralRuleService
                 }
             }
         }
+        integralRule.setImage1("");
+        integralRule.setImage2("");
+        integralRule.setImage3("");
+        integralRule.setImage4("");
+        integralRule.setImage5("");
         if(integralRule.getImgFileList()!=null &&  integralRule.getImgFileList().size()>0){
-            List<IntegralShopPic> imgFileList =integralRule.getImgFileList();
-            for (int j=0;j<imgFileList.size();j++){
+            for (int j=0;j<integralRule.getImgFileList().size();j++){
                 if(j==0){
-                    integralRule.setImage1(imgFileList.get(j).getUrl());
+                    integralRule.setImage1(integralRule.getImgFileList().get(j).getUrl());
                 }else if(j==1){
-                    integralRule.setImage2(imgFileList.get(j).getUrl());
+                    integralRule.setImage2(integralRule.getImgFileList().get(j).getUrl());
                 }else if(j==2){
-                    integralRule.setImage3(imgFileList.get(j).getUrl());
+                    integralRule.setImage3(integralRule.getImgFileList().get(j).getUrl());
                 }else if(j==3){
-                    integralRule.setImage4(imgFileList.get(j).getUrl());
+                    integralRule.setImage4(integralRule.getImgFileList().get(j).getUrl());
                 }else if(j==4){
-                    integralRule.setImage5(imgFileList.get(j).getUrl());
+                    integralRule.setImage5(integralRule.getImgFileList().get(j).getUrl());
                 }
             }
         }
@@ -274,37 +278,37 @@ public class IntegralRuleServiceImpl implements IIntegralRuleService
             rule.setItemsDetail(list);
             //查询图片信息
             List<IntegralShopPic> shopPicList =new ArrayList<>();
-            if(integralRule!=null && integralRule.getImage1() !=null && !integralRule.getImage1().equals("")){
+            if(rule.getImage1() !=null && !rule.getImage1().equals("")){
                 IntegralShopPic pic =new IntegralShopPic();
                 pic.setName("1");
-                pic.setUrl(integralRule.getImage1());
+                pic.setUrl(rule.getImage1());
                 shopPicList.add(pic);
             }
-            if(integralRule!=null && integralRule.getImage2() !=null && !integralRule.getImage2().equals("")){
+            if( rule.getImage2() !=null && !rule.getImage2().equals("")){
                 IntegralShopPic pic =new IntegralShopPic();
                 pic.setName("2");
-                pic.setUrl(integralRule.getImage2());
+                pic.setUrl(rule.getImage2());
                 shopPicList.add(pic);
             }
-            if(integralRule!=null && integralRule.getImage3() !=null && !integralRule.getImage3().equals("")){
+            if( rule.getImage3() !=null && !rule.getImage3().equals("")){
                 IntegralShopPic pic =new IntegralShopPic();
                 pic.setName("3");
-                pic.setUrl(integralRule.getImage3());
+                pic.setUrl(rule.getImage3());
                 shopPicList.add(pic);
             }
-            if(integralRule!=null && integralRule.getImage4() !=null && !integralRule.getImage4().equals("")){
+            if( rule.getImage4() !=null && !rule.getImage4().equals("")){
                 IntegralShopPic pic =new IntegralShopPic();
                 pic.setName("4");
-                pic.setUrl(integralRule.getImage4());
+                pic.setUrl(rule.getImage4());
                 shopPicList.add(pic);
             }
-            if(integralRule!=null && integralRule.getImage5() !=null && !integralRule.getImage5().equals("")){
+            if(rule.getImage5() !=null && !rule.getImage5().equals("")){
                 IntegralShopPic pic =new IntegralShopPic();
                 pic.setName("5");
-                pic.setUrl(integralRule.getImage5());
+                pic.setUrl(rule.getImage5());
                 shopPicList.add(pic);
             }
-            integralRule.setImgFileList(shopPicList);
+            rule.setImgFileList(shopPicList);
         }else{
             rule =new IntegralRule();
             rule.setIntegralFlag("0");
@@ -316,7 +320,7 @@ public class IntegralRuleServiceImpl implements IIntegralRuleService
             IntegralRuleDetail integralRuleDetail = new IntegralRuleDetail();
             list.add(integralRuleDetail);
             List<IntegralShopPic> shopPicList =new ArrayList<>();
-            integralRule.setImgFileList(shopPicList);
+            rule.setImgFileList(shopPicList);
             rule.setItemsDetail(list);
         }
         return rule;

yijia-integral/src/main/resources/mapper/integral/IntegralRuleMapper.xml

@@ -48,7 +48,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectIntegralRuleVo"/>
         <where>
             <if test="stationId != null "> and station_id = #{stationId}</if>
-            <if test="stationName != null  and stationName != ''"> and dept_name like concat('%', #{stationName}, '%')</if>
+            <if test="stationName != null  and stationName != ''"> and d.dept_name like concat('%', #{stationName}, '%')</if>
             <if test="termDateManage != null  and termDateManage != ''"> and term_date_manage = #{termDateManage}</if>
             <if test="emptyDate != null "> and empty_date = #{emptyDate}</if>
             <if test="integralActivity != null  and integralActivity != ''"> and integral_activity = #{integralActivity}</if>
@@ -92,7 +92,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="image2 != null">image2,</if>
             <if test="image3 != null">image3,</if>
             <if test="image4 != null">image4,</if>
-            <if test="image4 != null">image5,</if>
+            <if test="image5 != null">image5,</if>
          </trim>
         <trim prefix="values (" suffix=")" suffixOverrides=",">
             <if test="stationId != null">#{stationId},</if>
@@ -108,6 +108,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null">#{createTime},</if>
             <if test="updateBy != null">#{updateBy},</if>
             <if test="updateTime != null">#{updateTime},</if>
+            <if test="image1 != null">#{image1},</if>
+            <if test="image2 != null">#{image2},</if>
+            <if test="image3 != null">#{image3},</if>
+            <if test="image4 != null">#{image4},</if>
+            <if test="image5 != null">#{image5},</if>
          </trim>
     </insert>
 
@@ -127,6 +132,11 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="createTime != null  ">  create_time = #{createTime},</if>
             <if test="updateBy != null  ">  update_by = #{updateBy},</if>
             <if test="updateTime != null  ">  update_time = #{updateTime},</if>
+            <if test="image1 != null">image1=#{image1},</if>
+            <if test="image2 != null">image2=#{image2},</if>
+            <if test="image3 != null">image3=#{image3},</if>
+            <if test="image4 != null">image4=#{image4},</if>
+            <if test="image5 != null">image5=#{image5},</if>
         </trim>
         where id = #{id}
     </update>