Merge remote-tracking branch 'origin/master'

puzhibing

2023-08-01 276571374e8f0e2be2bdcfc5e8ea4a39af1599bc

 cloud-server-course/src/main/java/com/dsh/course/service/impl/TCoursePackageDiscountServiceImpl.java

@@ -82,16 +82,6 @@
                    if (integer >= maxSubscribeNumber){
                        continue;
                    }
                    /**
                     * [{
                     *    "startDate": "2023-01-01 00:00:00",
                     *    "endDate": "2023-12-31 23:59:59",
                     *    "startTime": "02:00:00",
                     *    "endTime": "23:00:00",
                     *    "weeks": [1, 2, 7],
                     *    "cashPayment": 100
                     * }]
                     */
                    try {
                        JSONArray jsonArray = JSON.parseArray(tCoursePackageDiscount.getContent());
                        JSONObject jsonObject = jsonArray.getJSONObject(0);
@@ -139,7 +129,8 @@
                                distanceVo.setLatitude(lat);
                                distanceVo.setLongitude(lon);
                                distanceVo.setStoreId(coursePackage.getStoreId());
                                resde.setStoreDistance(sreClient.calculateDistance(distanceVo));
                                String s = sreClient.calculateDistance(distanceVo);
                                resde.setStoreDistance(s);
                                list.add(resde);
                            }
                        }
@@ -183,6 +174,7 @@
                        e.printStackTrace();
                    }
                }
            }
            } else {
                tCoursePackageDiscountQueryWrapper.eq("type", 4);
                tCoursePackageDiscounts = this.baseMapper.selectList(tCoursePackageDiscountQueryWrapper);
@@ -197,14 +189,6 @@
                        if (integer >= maxSubscribeNumber){
                            continue;
                        }
//                    [{
//                        "startDate": "2023-01-01 00:00:00",
//                        "endDate": "2023-12-31 23:59:59",
//                        "startTime": "02:00:00",
//                        "endTime": "23:00:00",
//                        "weeks": [1, 2, 7],
//                        "hour": 10
//                    }]
                        try {
                            JSONArray jsonArray = JSON.parseArray(tCoursePackageDiscount.getContent());
                            JSONObject jsonObject = jsonArray.getJSONObject(0);
@@ -299,7 +283,7 @@
                    }
                }
            }
        }
        System.out.println("list"+list);
        return list;
    }

@@ -323,8 +307,8 @@
        distanceVo.setLatitude(lat);
        distanceVo.setLongitude(lon);
        distanceVo.setStoreId(coursePackage.getStoreId());
        long l = sreClient.calculateDistance(distanceVo);
        packageResponse.setDistance(l);
        String s = sreClient.calculateDistance(distanceVo);
        packageResponse.setDistance(Double.valueOf(s));

        JSONArray jsonArray = JSON.parseArray(coursePackageDiscount.getContent());
        JSONObject jsonObject = jsonArray.getJSONObject(0);