修改积分规则，积分商品

yijia-integral/src/main/java/com/yijia/integral/controller/IntegralRuleController.java

@@ -8,6 +8,7 @@ import com.yijia.common.utils.SecurityUtils;
 import com.yijia.system.service.ISysDeptService;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.PutMapping;
@@ -46,13 +47,14 @@ public class IntegralRuleController extends BaseController
     public TableDataInfo list(IntegralRule integralRule)
     {
         LoginUser currentUser = SecurityUtils.getLoginUser();
-        SysDept dept =new SysDept();
-        dept.setDeptId(currentUser.getUser().getDeptId());
-        List<String> list = sysDeptService.selectDeptId(dept);
-        if(list!=null && list.size()>0){
-            integralRule.setStationIdList(list);
-            integralRule.setStationId(null);
-        }
+//        SysDept dept =new SysDept();
+//        dept.setDeptId(currentUser.getUser().getDeptId());
+//        List<String> list = sysDeptService.selectDeptId(dept);
+//        if(list!=null && list.size()>0){
+//            integralRule.setStationIdList(list);
+//            integralRule.setStationId(null);
+//        }
+        integralRule.setStationId(currentUser.getUser().getDeptId());
         startPage();
         List<IntegralRule> integralRuleList = integralRuleService.selectIntegralRuleList(integralRule);
         return getDataTable(integralRuleList);
@@ -67,13 +69,14 @@ public class IntegralRuleController extends BaseController
     public TableDataInfo listRuleInfo(IntegralRule integralRule)
     {
         LoginUser currentUser = SecurityUtils.getLoginUser();
-        SysDept dept =new SysDept();
-        dept.setDeptId(currentUser.getUser().getDeptId());
-        List<String> list = sysDeptService.selectDeptId(dept);
-        if(list!=null && list.size()>0){
-            integralRule.setStationIdList(list);
-            integralRule.setStationId(null);
-        }
+        integralRule.setStationId(currentUser.getUser().getDeptId());
+//        SysDept dept =new SysDept();
+//        dept.setDeptId(currentUser.getUser().getDeptId());
+//        List<String> list = sysDeptService.selectDeptId(dept);
+//        if(list!=null && list.size()>0){
+//            integralRule.setStationIdList(list);
+//            integralRule.setStationId(null);
+//        }
         startPage();
         List<IntegralRule> integralRuleList = integralRuleService.listRuleInfo(integralRule);
         return getDataTable(integralRuleList);
@@ -83,13 +86,14 @@ public class IntegralRuleController extends BaseController
     public AjaxResult listRuleOne(IntegralRule integralRule)
     {
         LoginUser currentUser = SecurityUtils.getLoginUser();
-        SysDept dept =new SysDept();
-        dept.setDeptId(currentUser.getUser().getDeptId());
-        List<String> list = sysDeptService.selectDeptId(dept);
-        if(list!=null && list.size()>0){
-            integralRule.setStationIdList(list);
-            integralRule.setStationId(null);
-        }
+//        SysDept dept =new SysDept();
+//        dept.setDeptId(currentUser.getUser().getDeptId());
+//        List<String> list = sysDeptService.selectDeptId(dept);
+//        if(list!=null && list.size()>0){
+//            integralRule.setStationIdList(list);
+//            integralRule.setStationId(null);
+//        }
+        integralRule.setStationId(currentUser.getUser().getDeptId());
         IntegralRule rule = integralRuleService.selectIntegralRule(integralRule);
         return AjaxResult.success(rule);
     }
@@ -127,6 +131,7 @@ public class IntegralRuleController extends BaseController
      */
     @Log(title = "积分规则", businessType = BusinessType.INSERT)
     @PostMapping
+    @Transactional
     public AjaxResult add(@RequestBody IntegralRule integralRule)
     {
         LoginUser currentUser = SecurityUtils.getLoginUser();
@@ -134,6 +139,12 @@ public class IntegralRuleController extends BaseController
         if(integralRule!=null && integralRule.getIntegralActivity()==null){
             integralRule.setIntegralActivity("0");
         }
+        if(integralRule!=null &&integralRule.getIntegralFlag()!=null && !integralRule.getIntegralFlag().equals("")){
+            SysDept dept = new SysDept();
+            dept.setDeptId(currentUser.getUser().getDeptId());
+            dept.setIntegralFlag(integralRule.getIntegralFlag());
+            sysDeptService.updateDept(dept);
+        }
         return toAjax(integralRuleService.insertIntegralRule(integralRule));
     }
 
@@ -142,6 +153,7 @@ public class IntegralRuleController extends BaseController
      */
     @Log(title = "积分规则", businessType = BusinessType.UPDATE)
     @PutMapping
+    @Transactional
     public AjaxResult edit(@RequestBody IntegralRule integralRule)
     {
         LoginUser currentUser = SecurityUtils.getLoginUser();

yijia-integral/src/main/java/com/yijia/integral/domain/IntegralRule.java

@@ -199,7 +199,6 @@ public class IntegralRule extends BaseEntity
     }
 
     private List<IntegralRuleDetail> itemsDetail;
-    private List<IntegralRuleDetail> notOilList;
     private List<IntegralShopPic> imgFileList;
 
     public String getDatePickerTime() {
@@ -210,14 +209,6 @@ public class IntegralRule extends BaseEntity
         this.datePickerTime = datePickerTime;
     }
 
-    public List<IntegralRuleDetail> getNotOilList() {
-        return notOilList;
-    }
-
-    public void setNotOilList(List<IntegralRuleDetail> notOilList) {
-        this.notOilList = notOilList;
-    }
-
     public List<IntegralShopPic> getImgFileList() {
         return imgFileList;
     }

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

@@ -315,6 +315,8 @@ public class IntegralRuleServiceImpl implements IIntegralRuleService
             List<IntegralRuleDetail> list = new ArrayList<IntegralRuleDetail>();
             IntegralRuleDetail integralRuleDetail = new IntegralRuleDetail();
             list.add(integralRuleDetail);
+            List<IntegralShopPic> shopPicList =new ArrayList<>();
+            integralRule.setImgFileList(shopPicList);
             rule.setItemsDetail(list);
         }
         return rule;

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

@@ -72,7 +72,7 @@ public class IntegralWaresServiceImpl implements IIntegralWaresService
         LoginUser currentUser = SecurityUtils.getLoginUser();
         integralWares.setWaresStatus("3");
         integralWaresMapper.updateIntegralWares(integralWares);
-        IntegralWares wares =new IntegralWares();
+        IntegralWares wares = integralWaresMapper.selectIntegralWaresById(integralWares.getId());
         wares.setWaresStatus("1");
         wares.setCreateTime(DateUtils.getNowDate());
         wares.setCreateBy(currentUser.getUser().getUserId()+"");
@@ -81,8 +81,8 @@ public class IntegralWaresServiceImpl implements IIntegralWaresService
         wares.setSaleIntegral(integralWares.getSaleIntegral());
         wares.setWaresPic(integralWares.getWaresPic());
         wares.setWaresDetail(integralWares.getWaresDetail());
-        wares.setWaresCount(integralWares.getWaresCount());
-        wares.setWaresOutCount(integralWares.getWaresOutCount());
+        wares.setWaresCount(wares.getWaresCount());
+        wares.setWaresOutCount(wares.getWaresOutCount());
         return integralWaresMapper.insertIntegralWares(wares);
     }
 

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

@@ -55,7 +55,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 </foreach>
             </if>
         </where>
-        order by  id desc
+        order by  wares_status
     </select>
 
     <select id="selectIntegralWaresById" parameterType="Long" resultMap="IntegralWaresResult">