Merge branch 'hz_master'

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/ActivityRuleBiz.java

@@ -9,12 +9,10 @@ import com.xxfc.platform.activity.vo.ActivityRuleVo;
 import org.apache.commons.beanutils.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-
 import com.xxfc.platform.activity.entity.ActivityRule;
 import com.xxfc.platform.activity.mapper.ActivityRuleMapper;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import tk.mybatis.mapper.entity.Example;
-
 import java.util.ArrayList;
 import java.util.List;
 
@@ -64,7 +62,14 @@ public class ActivityRuleBiz extends BaseBiz<ActivityRuleMapper,ActivityRule> {
                     if(array.size()>0){
                         for(int i=0;i<array.size();i++){
                             Integer id=array.getJSONObject(i).getInteger("id");
-                            coupons.add(couponBiz.selectById(id));
+                            Coupon coupon=couponBiz.selectById(id);
+                            if (coupon!=null&&coupon.getIsDel()==0&&coupon.getStatus()==1){
+                                if (coupon.getValidType()==2){
+                                    int days=coupon.getValidDays()==null?0:coupon.getValidDays();
+                                    coupon.setValidEndTime(System.currentTimeMillis()+(days*24*60*60*1000L));
+                                }
+                                coupons.add(coupon);
+                            }
                         }
                     }
                     ruleVo.setCoupons(coupons);

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/BranchCompanyBiz.java

@@ -10,6 +10,7 @@ import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
 import com.github.wxiaoqi.security.admin.feign.rest.UserRestInterface;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.google.common.collect.Lists;
 import com.xxfc.platform.vehicle.common.RestResponse;
@@ -398,4 +399,16 @@ public class BranchCompanyBiz extends BaseBiz<BranchCompanyMapper, BranchCompany
      return  mapper.getList();
     }
 
+    public ObjectRestResponse branchCompans() {
+        UserDTO userDTO = getAdminUserInfo();
+        List<BranchCompany> list;
+        if (userDTO != null&&userDTO.getDataAll() == DATA_ALL_FALSE) {
+            List<Integer> branchCompanies = vehicleBiz.dataCompany(userDTO.getDataZone(), userDTO.getDataCompany());
+            list = mapper.selectByIdList(branchCompanies);
+        }else {
+            list=getAll();
+        }
+        return  ObjectRestResponse.succ(list);
+    }
+
 }

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/BranchCompanyController.java

@@ -32,6 +32,7 @@ import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.servlet.http.HttpServletRequest;
+import java.util.ArrayList;
 import java.util.List;
 import java.util.Map;
 
@@ -211,4 +212,9 @@ public class BranchCompanyController extends BaseController<BranchCompanyBiz> {
         PageDataVO<BranchCompanyListVO> pageDataVO = baseBiz.findBranchCompanyWithPage(branchCompanyFindDTO);
         return pageDataVO;
     }
+
+    @RequestMapping(value ="/companys",method = RequestMethod.GET)
+    public ObjectRestResponse<List<BranchCompany>> companys() {
+        return baseBiz.branchCompans();
+    }
 }