bug修改

无关风月

2025-04-12 3c8dc107047c0b5ee407fa36ca2ce06090f75929

bug修改

 cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminAgreementController.java

@@ -76,6 +76,9 @@
        if (tHuiminAgreement.getObjectType().equals(2) || tHuiminAgreement.getObjectType().equals(1) && Objects.isNull(operatorId)) {
            if (tHuiminAgreement.getObjectType().equals(1)) {
                tHuiminAgreement.setOperatorId(null);
                boolean remove = huiminAgreementService.remove(new LambdaQueryWrapper<THuiminAgreement>()
                        .isNull(THuiminAgreement::getOperatorId));

            }
            huiminAgreementService.saveOrUpdate(tHuiminAgreement);
            //删除之前的协议配置

 cloud-server-activity/src/main/java/com/dsh/activity/controller/HuiminController.java

@@ -221,7 +221,16 @@
                                    .eq(THuiminAgreementSetting::getAgreementId, huiminAgreement.getId()));
                            huiminCard.setAgreementSettings(list);
                        }else {
                            huiminCard.setAgreementSettings(new ArrayList<>());
                            THuiminAgreement huiminAgreement1 = huiminAgreementService.getOne(new LambdaQueryWrapper<THuiminAgreement>()
                                    .isNull(THuiminAgreement::getOperatorId));
                            if (huiminAgreement1!=null){
                                List<THuiminAgreementSetting> list = huiminAgreementSettingService.list(new LambdaQueryWrapper<THuiminAgreementSetting>()
                                        .eq(THuiminAgreementSetting::getAgreementId, huiminAgreement1.getId()));
                                huiminCard.setAgreementSettings(list);
                            }else {
                                huiminCard.setAgreementSettings(new ArrayList<>());

                            }
                        }
                    }
                }else{
@@ -273,7 +282,15 @@
            }else{
                THuiminAgreement one = huiminAgreementService.getOne(new LambdaQueryWrapper<THuiminAgreement>()
                        .eq(THuiminAgreement::getOperatorId,store.getOperatorId()).last("limit 1"));
                huiminAgreementVO.setIntroduce(one.getStoreNoHuiminCardIntro());
                if (one == null){
                    THuiminAgreement two = huiminAgreementService.getOne(new LambdaQueryWrapper<THuiminAgreement>()
                            .isNull(THuiminAgreement::getOperatorId).last("limit 1"));
                    huiminAgreementVO.setIntroduce(two.getStoreNoHuiminCardIntro());

                }else{
                    huiminAgreementVO.setIntroduce(one.getStoreNoHuiminCardIntro());

                }

            }


 cloud-server-activity/src/main/java/com/dsh/activity/controller/PayHuiminController.java

@@ -51,9 +51,9 @@
     * @param id
     */
    @PostMapping("/base/tPayHuimin/refund")
    public ResultUtil<?> refund(@RequestBody Integer id){
    public void refund(@RequestBody Integer id){
        try {
           return  payHuiminService.refund(id);
             payHuiminService.refund(id);
        } catch (AlipayApiException e) {
            throw new RuntimeException(e);
        }

 cloud-server-management/src/main/java/com/dsh/course/feignClient/activity/PayHuiminClient.java

@@ -39,7 +39,7 @@
     * @param id
     */
    @PostMapping("/base/tPayHuimin/refund")
    ResultUtil<?> refund(@RequestBody Integer id);
    void refund(@RequestBody Integer id);

    @PostMapping("/base/tPayHuimin/export-data")
    List<SalesDetailVO> exportData(@RequestBody HuiminPayQuery query);

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

@@ -191,7 +191,8 @@
    @PostMapping("/refund")
    @ResponseBody
    public ResultUtil<?> refund(Integer id) {
        return payHuiminClient.refund(id);
        payHuiminClient.refund(id);
        return ResultUtil.success();
    }

    /**