设备消息BUG解决，品牌

admin

2019-06-14 1e92eff67b997263ecefa255c63eb6641c47b57f

设备消息BUG解决，品牌

 fanli/src/main/java/com/yeshi/fanli/controller/CallBackController.java

@@ -71,6 +71,8 @@
        } catch (IOException e) {

            e.printStackTrace();

        }

		
        LogHelper.test("美洽:body----" + sb.toString());



        String sign = "";

        try {

@@ -99,7 +101,7 @@
                    "android".equalsIgnoreCase(deviceOS) ? 1 : 2, 1, msg, new Date());

        }



        LogHelper.test("美洽:body----" + sb.toString());

		
    }



    public String sign(String raw_body) throws java.security.SignatureException {


 fanli/src/main/java/com/yeshi/fanli/controller/admin/BrandShopAdminController.java

@@ -37,14 +37,13 @@
@Controller

@RequestMapping("admin/new/api/v1/brand")

public class BrandShopAdminController {

	


    @Resource

    private BrandClassService brandClassService;

	


    @Resource

    private BrandClassShopService brandClassShopService;

	
	


    /**

     * 保存信息

     * 

@@ -55,7 +54,7 @@
    @RequestMapping(value = "save")

    public void save(String callback, BrandClass brandClass, PrintWriter out) {

        try {

            brandClassService.saveObject(brandClass);

            brandClassService.saveObject(brandClass);

            JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("保存成功"));

        } catch (BrandClassException e) {

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));

@@ -65,8 +64,6 @@
        }

    }





	
    /**

     * 修改排序

     * 

@@ -86,20 +83,20 @@
            e.printStackTrace();

        }

    }

	


	
    /**

     * 查询

     * 
     * @param callback

     * @param pageIndex

     * @param pageSize

     * @param key  模糊查询：说明、标识

     * @param key

     *            模糊查询：说明、标识

     * @param out

     */

    @RequestMapping(value = "query")

    public void query(String callback, Integer pageIndex, Integer pageSize, String key,

            Integer state, PrintWriter out) {

    public void query(String callback, Integer pageIndex, Integer pageSize, String key, Integer state,

            PrintWriter out) {



        if (pageIndex == null || pageIndex < 1) {

            pageIndex = 1;

@@ -116,14 +113,14 @@
                JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("暂无数据"));

                return;

            }

			


            long count = brandClassService.countQuery(key, state);

			


            int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);

            PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);



            GsonBuilder gsonBuilder = new GsonBuilder();

            gsonBuilder.serializeNulls(); 
            gsonBuilder.serializeNulls();

            Gson gson = gsonBuilder.setDateFormat("yyyy/MM/dd HH:mm:ss").create();



            JSONObject data = new JSONObject();

@@ -138,9 +135,9 @@
        }

    }





    /**

     * 删除

     * 
     * @param callback

     * @param idArray

     * @param out

@@ -154,22 +151,24 @@
                return;

            }

            Gson gson = new Gson();

            List<Long> list = gson.fromJson(idArray, new TypeToken<ArrayList<Long>>() {}.getType());

            List<Long> list = gson.fromJson(idArray, new TypeToken<ArrayList<Long>>() {

            }.getType());



            if (list == null || list.size() == 0) {

                JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("未检测到删除的数据"));

                return;

            }

            int count = brandClassService.deleteBatchByPrimaryKey(list);

            JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("成功删除["+ count +"]条数据"));

            JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("成功删除[" + count + "]条数据"));

        } catch (Exception e) {

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("删除失败"));

            e.printStackTrace();

        }

    }

	


    /**

     * 筛选列表

     * 
     * @param callback

     * @param out

     */

@@ -184,14 +183,14 @@


            List<Object> result_list = new ArrayList<Object>();

            if (list != null && list.size() > 0) {

                for (BrandClass record: list) {

                    Map<String,Object> map =new HashMap<String,Object>();

                for (BrandClass record : list) {

                    Map<String, Object> map = new HashMap<String, Object>();

                    map.put("key", record.getId());

                    map.put("value", record.getName());

                    result_list.add(map);

                }

            }

			


            JSONObject data = new JSONObject();

            data.put("result_list", result_list);

            JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));

@@ -201,14 +200,14 @@
        }

    }



	
	
    /**

     * 查询

     * 
     * @param callback

     * @param pageIndex

     * @param pageSize

     * @param key  模糊查询：说明、标识

     * @param key

     *            模糊查询：说明、标识

     * @param out

     */

    @RequestMapping(value = "queryTaoBaoShop")

@@ -217,59 +216,58 @@
        if (pageIndex == null || pageIndex < 1) {

            pageIndex = 1;

        }

		


        if (pageSize == null || pageSize < 1) {

            pageSize = Constant.PAGE_SIZE;

        }

		


        try {

            TaoBaoShopInfoDTO  taoBaoShopInfoDTO = TaoKeApiUtil.searchShop(key, pageIndex, pageSize);

			
            TaoBaoShopInfoDTO taoBaoShopInfoDTO = TaoKeApiUtil.searchShop(key, pageIndex, pageSize);



            List<TaoBaoShopInfo> listInfo = taoBaoShopInfoDTO.getListInfo();

            if (listInfo == null || listInfo.size() == 0) {

                JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("暂无数据"));

                return;

            }

			


            List<Long> listShopId = new ArrayList<Long>();

            for (TaoBaoShopInfo taoBaoShopInfo: listInfo) {

            for (TaoBaoShopInfo taoBaoShopInfo : listInfo) {

                listShopId.add(taoBaoShopInfo.getUserId());

            }

			


            // 已存在数据库中

            List<BrandClassShop> listExist = brandClassShopService.getExistByShopIds(listShopId);

			


            JSONArray array = new JSONArray();

            for (TaoBaoShopInfo taoBaoShopInfo: listInfo) {

            for (TaoBaoShopInfo taoBaoShopInfo : listInfo) {

                String name = "";

                if (listExist != null && listExist.size() > 0) {

                    Long userId = taoBaoShopInfo.getUserId();

                    for (BrandClassShop brandClassShop: listExist) {

                    for (BrandClassShop brandClassShop : listExist) {

                        TaoBaoShop shop = brandClassShop.getShop();

                        if (shop !=null && userId == shop.getId() || userId.equals(shop.getId()) ) {

                        if (shop != null && userId == shop.getId() || userId.equals(shop.getId())) {

                            BrandClass brandClass = brandClassShop.getBrandClass();

                            name = brandClass.getName();

                        }

                    }

                }

				


                JSONObject innerData = new JSONObject();

                innerData.put("cname", name);

                innerData.put("shopInfo", taoBaoShopInfo);

                array.add(innerData);

            }

			


            JSONObject data = new JSONObject();

            data.put("pe", taoBaoShopInfoDTO.getPage());

            data.put("result_list",array);

            data.put("result_list", array);

            JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult(data));

        } catch (Exception e) {

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("操作异常"));

            e.printStackTrace();

        }

    }

	
	


    /**

     * 添加店铺入库

     * 

@@ -278,20 +276,21 @@
     * @param out

     */

    @RequestMapping(value = "saveShopInfo")

    public void saveShopInfo(String callback,Long cid, String idArray, PrintWriter out) {

    public void saveShopInfo(String callback, Long cid, String idArray, PrintWriter out) {

        try {

            if (StringUtil.isNullOrEmpty(idArray)) {

                JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("请选择操作的数据"));

                return;

            }

            Gson gson = new Gson();

            List<Long> list = gson.fromJson(idArray, new TypeToken<ArrayList<Long>>() {}.getType());

            List<Long> list = gson.fromJson(idArray, new TypeToken<ArrayList<Long>>() {

            }.getType());



            String shopIds = brandClassShopService.saveShopInfo(cid,list);

            String shopIds = brandClassShopService.saveShopInfo(cid, list);

            if (StringUtil.isNullOrEmpty(shopIds)) {

                JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("保存成功"));

            } else {

                JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("以下店铺ID:"+ shopIds + ",未添加成功"));

                JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("以下店铺ID:" + shopIds + ",未添加成功"));

            }

        } catch (BrandClassShopException e) {

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));

@@ -300,20 +299,20 @@
            e.printStackTrace();

        }

    }

	
	


    /**

     * 查询

     * 
     * @param callback

     * @param pageIndex

     * @param pageSize

     * @param key  模糊查询：说明、标识

     * @param key

     *            模糊查询：说明、标识

     * @param out

     */

    @RequestMapping(value = "queryClassShop")

    public void queryClassShop(String callback, Integer pageIndex, Integer pageSize, String key,

            Long cid , Integer state, PrintWriter out) {

    public void queryClassShop(String callback, Integer pageIndex, Integer pageSize, String key, Long cid,

            Integer state, PrintWriter out) {



        if (pageIndex == null || pageIndex < 1) {

            pageIndex = 1;

@@ -324,20 +323,21 @@
        }



        try {

            List<BrandClassShop> list = brandClassShopService.listQuery((pageIndex - 1) * pageSize, pageSize, key, cid, state);

            List<BrandClassShop> list = brandClassShopService.listQuery((pageIndex - 1) * pageSize, pageSize, key, cid,

                    state);



            if (list == null || list.size() == 0) {

                JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("暂无数据"));

                return;

            }

			


            long count = brandClassShopService.countQuery(key, cid, state);

			


            int totalPage = (int) (count % pageSize == 0 ? count / pageSize : count / pageSize + 1);

            PageEntity pe = new PageEntity(pageIndex, pageSize, count, totalPage);



            GsonBuilder gsonBuilder = new GsonBuilder();

            gsonBuilder.serializeNulls(); 
            gsonBuilder.serializeNulls();

            Gson gson = gsonBuilder.setDateFormat("yyyy/MM/dd HH:mm:ss").create();



            JSONObject data = new JSONObject();

@@ -352,7 +352,6 @@
        }

    }



	
    /**

     * 保存信息

     * 

@@ -362,14 +361,14 @@
     */

    @RequestMapping(value = "saveClassShop")

    public void saveClassShop(String callback, Long id, Long cid, String shopName, Integer state, Integer top,

            HttpServletRequest request, PrintWriter out) {

            String key, HttpServletRequest request, PrintWriter out) {

        try {

            if (request instanceof MultipartHttpServletRequest) {

                MultipartHttpServletRequest fileRequest = (MultipartHttpServletRequest) request;

                brandClassShopService.changeShopInfo(fileRequest.getFile("file"), id, cid, shopName, state, top);

            }else{

                brandClassShopService.changeShopInfo(null, id, cid, shopName, state, top);

            }

                MultipartHttpServletRequest fileRequest = (MultipartHttpServletRequest) request;

                brandClassShopService.changeShopInfo(fileRequest.getFile("file"), id, cid, shopName, state, top, key);

            } else {

                brandClassShopService.changeShopInfo(null, id, cid, shopName, state, top, key);

            }

            JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("保存成功"));

        } catch (BrandClassShopException e) {

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult(e.getMsg()));

@@ -378,8 +377,7 @@
            e.printStackTrace();

        }

    }

	
	


    /**

     * 修改排序

     * 

@@ -399,10 +397,10 @@
            e.printStackTrace();

        }

    }

	
	


    /**

     * 删除

     * 
     * @param callback

     * @param idArray

     * @param out

@@ -415,15 +413,16 @@
                return;

            }

            Gson gson = new Gson();

            List<Long> list = gson.fromJson(idArray, new TypeToken<ArrayList<Long>>() {}.getType());

            List<Long> list = gson.fromJson(idArray, new TypeToken<ArrayList<Long>>() {

            }.getType());



            if (list == null || list.size() == 0) {

                JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("未检测到删除的数据"));

                return;

            }

			


            brandClassShopService.deleteBatchByPrimaryKey(list);

			


            JsonUtil.printMode(out, callback, JsonUtil.loadTrueResult("删除成功"));

        } catch (Exception e) {

            JsonUtil.printMode(out, callback, JsonUtil.loadFalseResult("删除失败"));


 fanli/src/main/java/com/yeshi/fanli/mapping/msg/MsgDeviceReadStateMapper.xml

@@ -76,7 +76,7 @@
            <if test="unReadCount != null">#{unReadCount,jdbcType=INTEGER},</if>
            <if test="createTime != null">#{createTime,jdbcType=TIMESTAMP},</if>
            <if test="updateTime != null">#{updateTime,jdbcType=TIMESTAMP},</if>
            <if test="latestContent != null">#{latestContent,jdbcType=VARCHAR}</if>
            <if test="latestContent != null">#{latestContent,jdbcType=VARCHAR},</if>
            <if test="latestContentTime != null">#{latestContentTime,jdbcType=TIMESTAMP}</if>
        </trim>
    </insert>

 fanli/src/main/java/com/yeshi/fanli/mapping/taobao/TaoBaoShopMapper.xml

@@ -204,11 +204,11 @@
    <select id="getShopByKey"  resultMap="BaseResultVOMap" >
        SELECT * FROM (SELECT COUNT(t.`id`) AS totalGoods,po.* FROM  yeshi_ec_taobao_shop_info po
                        LEFT JOIN `yeshi_ec_taobao_goods` t  ON t.`sellerId` = po.`tsi_id`
                        WHERE <![CDATA[t.`couponAmount` > 0 AND po.`tsi_key` LIKE '%${key}%'
                        WHERE <![CDATA[t.`couponAmount` > 0 AND  FIND_IN_SET(#{key},po.`tsi_key`)
                        GROUP BY t.`sellerId` HAVING totalGoods> 2]]>)A
        LEFT JOIN (SELECT t.*,po.`tsi_id` FROM  yeshi_ec_taobao_shop_info po
                    LEFT JOIN `yeshi_ec_taobao_goods` t  ON t.`sellerId` = po.`tsi_id`
                    WHERE<![CDATA[ t.`couponAmount` > 0 ]]>AND po.`tsi_key` LIKE '%${key}%'
                    WHERE<![CDATA[ t.`couponAmount` > 0 ]]>AND FIND_IN_SET(#{key},po.`tsi_key`)
                    ORDER BY t.`biz30day` DESC
                    LIMIT 3)B ON B.`tsi_id` = A.`tsi_id`
    </select>

 fanli/src/main/java/com/yeshi/fanli/service/impl/brand/BrandClassShopServiceImpl.java

@@ -126,7 +126,7 @@


    @Override

    @Transactional

    public void changeShopInfo(MultipartFile file, Long id, Long cid, String shopName, Integer state, Integer top)

    public void changeShopInfo(MultipartFile file, Long id, Long cid, String shopName, Integer state, Integer top,String key)

            throws BrandClassShopException {



        if (id == null) {

@@ -148,7 +148,7 @@
        }



        // 自定义图片

        taoBaoShopService.changeInfo(file, shop.getId(), shopName);

        taoBaoShopService.changeInfo(file, shop.getId(), shopName,key);



        BrandClassShop updateshop = new BrandClassShop();

        updateshop.setState(state);


 fanli/src/main/java/com/yeshi/fanli/service/impl/taobao/TaoBaoShopServiceImpl.java

@@ -35,7 +35,7 @@


    @Resource

    private TaoBaoShopMapper taoBaoShopMapper;

	


    @Resource

    private HongBaoManageService hongBaoManageService;



@@ -81,7 +81,7 @@
    }



    @Override

    public void changeInfo(MultipartFile file, Long id, String shopName) {

    public void changeInfo(MultipartFile file, Long id, String shopName, String key) {

        TaoBaoShop taoBaoShop = taoBaoShopMapper.selectByPrimaryKey(id);

        if (taoBaoShop == null) {

            return;

@@ -113,6 +113,7 @@


        updateShop.setId(id);

        updateShop.setShopNameCustom(shopName);

        updateShop.setKey(key);

        taoBaoShopMapper.updateByPrimaryKeySelective(updateShop);

    }



@@ -161,7 +162,6 @@
        return shop;

    }



	
    @Override

    @Cacheable(value = "brandCache", key = "'getShopByKey-'+#key")

    public List<TaoBaoShopVO> getShopByKey(String key) {


 fanli/src/main/java/com/yeshi/fanli/service/inter/brand/BrandClassShopService.java

@@ -55,7 +55,7 @@
     * @param state

     * @throws BrandClassShopException

     */

    public void changeShopInfo(MultipartFile file, Long id, Long cid, String shopName, Integer state, Integer top)

    public void changeShopInfo(MultipartFile file, Long id, Long cid, String shopName, Integer state, Integer top,String key)

            throws BrandClassShopException;

    

    


 fanli/src/main/java/com/yeshi/fanli/service/inter/taobao/TaoBaoShopService.java

@@ -47,7 +47,7 @@
     * @param id

     * @param shopName

     */

    public void changeInfo(MultipartFile file, Long id, String shopName);

    public void changeInfo(MultipartFile file, Long id, String shopName,String key);



    /**

     * 查询店铺信息、并返回钱3个商品数量


 fanli/src/main/java/com/yeshi/fanli/util/VersionUtil.java

@@ -12,7 +12,7 @@


    public static boolean greaterThan_1_5_50(String platform, String versionCode) {

        if ((("android".equalsIgnoreCase(platform) && Integer.parseInt(versionCode) >= 42))

                || (("ios".equalsIgnoreCase(platform) && Integer.parseInt(versionCode) >= 51)))

                || (("ios".equalsIgnoreCase(platform) && Integer.parseInt(versionCode) >= 52)))

            return true;

        else

            return false;