玩湃
blame | 历史 | 补丁 | 提交 | 提交对比 | ignore whitespace
liujie
2023-10-17 add2d28c3aeccfe57338c439967abbb83117b20e 
 cloud-server-account/src/main/java/com/dsh/account/service/impl/TAppUserServiceImpl.java


@@ -616,7 +616,7 @@


            for (Store store : stores) {


                Map<String, Double> distance = GeodesyUtil.getDistance(lon + "," + lat, store.getLon() + "," + store.getLat());


                Double wgs84 = distance.get("WGS84");


                if(s == null || d.compareTo(wgs84) < 0){


                if(s == null || d>wgs84){


                    s = store;


                    d = wgs84;


                }


@@ -835,7 +835,7 @@


                        if (vicinityGood.getRedemptionMethod() == 1) {


                            commodity.setIntegral(vicinityGood.getIntegral().intValue());


                        } else {


                            commodity.setIntegral(vicinityGood.getIntegral().intValue());


                            commodity.setIntegral(ToolUtil.isEmpty(vicinityGood.getIntegral())?0:vicinityGood.getIntegral());


                            commodity.setAmount(vicinityGood.getCash());


                        }


                        commodity.setBelongsType(vicinityGood.getUserPopulation());


@@ -869,7 +869,7 @@


                        if (vicinityGood.getRedemptionMethod() == 1) {


                            commodity.setIntegral(vicinityGood.getIntegral().intValue());


                        } else {


                            commodity.setIntegral(vicinityGood.getIntegral().intValue());


                            commodity.setIntegral(ToolUtil.isEmpty(vicinityGood.getIntegral())?0:vicinityGood.getIntegral());


                            commodity.setAmount(vicinityGood.getCash());


                        }


                        commodity.setBelongsType(vicinityGood.getUserPopulation());