玩湃门店数据权限修改 收入管理增加世界杯记录

无关风月

2024-07-24 f6fe09539d37e44b199d6c1d09798088209d6d72

玩湃门店数据权限修改 收入管理增加世界杯记录

 cloud-server-course/src/main/java/com/dsh/course/mapper/TCoursePackagePaymentMapper.java

@@ -77,7 +77,7 @@
    void updateBytime(@Param("coursePackagePayment") TCoursePackagePayment coursePackagePayment);

    List<Map<String, Object>> getStudentTotal(@Param("appUserIds") List<Integer> appUserIds, @Param("start") String start,
                                              @Param("end") String end);
                                              @Param("end") String end,@Param("packageIds")List<Integer> packageIds );

    List<Map<String, Object>> pacQueryDto(@Param("start") String start, @Param("end") String end,
                                          @Param("storeIds") List<Integer> storeIds, @Param("name") String name);

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

@@ -6,7 +6,11 @@
import com.alibaba.fastjson.JSONArray;
import com.alibaba.fastjson.JSONObject;
import com.alipay.api.AlipayApiException;
import com.alipay.api.AlipayClient;
import com.alipay.api.DefaultAlipayClient;
import com.alipay.api.domain.Person;
import com.alipay.api.request.AlipayTradeOrderSettleRequest;
import com.alipay.api.response.AlipayTradeOrderSettleResponse;
import com.alipay.api.response.AlipayTradeQueryResponse;
import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
@@ -47,6 +51,7 @@
import javax.annotation.Resource;
import javax.persistence.criteria.CriteriaBuilder;
import java.math.BigDecimal;
import java.math.BigInteger;
import java.math.MathContext;
import java.math.RoundingMode;
import java.text.ParseException;
@@ -172,7 +177,7 @@
        if(null != appUserIds){
            status.in("appUserId", appUserIds);
        }
        List<Map<String, Object>> maps = this.baseMapper.getStudentTotal(appUserIds, studentQeryDto.getStart(), studentQeryDto.getEnd());
        List<Map<String, Object>> maps = this.baseMapper.getStudentTotal(appUserIds, studentQeryDto.getStart(), studentQeryDto.getEnd(),studentQeryDto.getCoursePackageIds());
        List<Map<String, Object>> list = new ArrayList<>();
        for (Map<String, Object> objectMap : maps) {
            if(null == objectMap.get("studentId")){

 cloud-server-course/src/main/resources/mapper/TCoursePackagePaymentMapper.xml

@@ -183,6 +183,12 @@
                    #{item}
                </foreach>
            </if>
        <if test="null != packageIds">
                and coursePackageId in
                <foreach collection="packageIds" item="item" index="index" open="(" separator="," close=")">
                    #{item}
                </foreach>
            </if>
            <if test="null != start and '' != start and null != end and '' != end">
                and DATE_FORMAT(classDate, '%Y-%m-%d') between #{start} and #{end}
            </if>

 cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/system/BallController.java

@@ -1023,8 +1023,13 @@
                List<TCoursePackage> coursePackageByStoreId = coursePackageClient.getCoursePackageByStoreId(storeId);
                tCoursePackages.addAll(coursePackageByStoreId);
            }

            List<Integer> coursePackageByStoreIds = tCoursePackages.stream().distinct().map(TCoursePackage::getId).collect(Collectors.toList());
            if (tCoursePackages.isEmpty()){
                coursePackageByStoreIds.add(-1);
            }
            studentQeryDto.setCoursePackageIds(coursePackageByStoreIds);

        }
        // 如果当前登陆人是门店 只查询该门店下的课包的数据
        if(UserExt.getUser().getObjectType() == 3){
@@ -1039,8 +1044,12 @@
                tCoursePackages.addAll(coursePackageByStoreId);
            }
            List<Integer> coursePackageByStoreIds = tCoursePackages.stream().distinct().map(TCoursePackage::getId).collect(Collectors.toList());
            if (tCoursePackages.isEmpty()){
                coursePackageByStoreIds.add(-1);
            }
            studentQeryDto.setCoursePackageIds(coursePackageByStoreIds);
        }

        List<Map<String, Object>>  pays = coursePackageClient.getStudentTotal(studentQeryDto);
        return pays;
    }