10.20.4

nickchange

2023-10-21 8e1aafc0534a4a87e47ad3c09aa4762cbda76849

10.20.4

 cloud-server-account/src/main/java/com/dsh/account/feignclient/activity/MerChandiseClient.java

@@ -33,7 +33,7 @@
    ExchangeDetailsVo getIntegralExchangeDetails(@RequestBody Integer appUserId);

    @PostMapping("/base/pointMerchars/getSpecificsOfGoods")
    public PointDetailsVo getSpecificsOfGoods(@RequestBody Long speMercharsId);
     PointDetailsVo getSpecificsOfGoods(@RequestBody Long speMercharsId);

    @PostMapping("/base/pointMerchars/selectPointsMerchandiseById")
    public PointsMerchandise selectPointsMerchandiseById(@RequestBody Integer speMercharsId);

 cloud-server-competition/src/main/java/com/dsh/competition/service/impl/CompetitionServiceImpl.java

@@ -196,6 +196,10 @@
        AppUser appUser = appUserClient.queryAppUser(uid);
        String[] split = paymentCompetitionVo.getIds().split(";");
        Competition competition = this.getById(paymentCompetitionVo.getId());
        if ((competition.getBaseNumber()+split.length)>competition.getApplicantsNumber()){
            return ResultUtil.error("报名人数超过最大限制");

        }
        BigDecimal money = null;
        if(paymentCompetitionVo.getPayType() == 1 || paymentCompetitionVo.getPayType() == 2){
            money = new BigDecimal(competition.getCashPrice()).multiply(new BigDecimal(split.length)).setScale(2, RoundingMode.HALF_EVEN);
@@ -283,7 +287,7 @@
            paymentCompetition.setPayOrderNo("");
            paymentCompetitionService.updateById(paymentCompetition);

            competition.setApplicantsNumber(competition.getApplicantsNumber() + 1);
            competition.setBaseNumber(competition.getBaseNumber() + 1);
            this.updateById(competition);
        }
        return ResultUtil.success();

 cloud-server-course/src/main/java/com/dsh/course/controller/CoursePackagePaymentController.java

@@ -436,8 +436,10 @@
                resp.setTotalCourseNums(tCoursePackagePayment.getTotalClassHours());
                resp.setResidueNums(tCoursePackagePayment.getLaveClassHours());
                resp.setDeductionNums(tCoursePackagePayment.getTotalClassHours()-tCoursePackagePayment.getLaveClassHours());
                if (tCoursePackage.getValidDays()!=null){
                String afterDayDate = DateUtil.getAfterDayDate2(tCoursePackage.getInsertTime(),tCoursePackage.getValidDays() + "");
                resp.setPeriodOfValidity(afterDayDate);
                }
                resps.add(resp);
            }
        }

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

@@ -521,7 +521,12 @@
                }catch (Exception e){
                    e.printStackTrace();
                }
            }else if(useScope==1){
                Integer id = pointMercharsClient.add(pointsMerchandise);
            }



        }
        return new SuccessTip<>();


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

@@ -34,12 +34,14 @@

import groovyjarjarpicocli.CommandLine;
import net.bytebuddy.asm.Advice;
import org.apache.http.HttpResponse;
import org.aspectj.weaver.ast.Var;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpRequest;
import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.*;
import org.springframework.web.servlet.resource.HttpResource;

import javax.annotation.Resource;
import java.lang.reflect.Type;
@@ -641,6 +643,7 @@
        model.addAttribute("objectId",objectId);
        model.addAttribute("stores",stores);
        return PREFIX + "tSite_add.html";

    }

//    /**

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tShop/TShop_add.html

@@ -169,8 +169,7 @@

        </div>

    </div>
</div>

<script src="${ctxPath}/modular/system/tShop/tShop_info.js"></script>
<script src="${ctxPath}/js/vue/vue.js"></script>
<script src="${ctxPath}/js/elementui/index.js"></script>

 cloud-server-management/src/main/webapp/WEB-INF/view/system/tSite/TSite_add.html

@@ -219,9 +219,11 @@
<script src="${ctxPath}/js/vue/vue.js"></script>
<script src="${ctxPath}/js/elementui/index.js"></script>
<link rel="stylesheet" href="${ctxPath}/js/elementui/index.css">
<link href="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.13/css/select2.min.css" rel="stylesheet" />
<script src="https://cdnjs.cloudflare.com/ajax/libs/select2/4.0.13/js/select2.min.js"></script>
<link href="http://cdnjs.cloudflare.com/ajax/libs/select2/4.0.13/css/select2.min.css" rel="stylesheet" />
<script src="http://cdnjs.cloudflare.com/ajax/libs/select2/4.0.13/js/select2.min.js"></script>
<script>


    $(document).ready(function() {
        $('#yys').select2({
            width: '300px',

 cloud-server-management/src/main/webapp/static/modular/system/tShop/tShop_info.js

@@ -162,6 +162,17 @@
 */
TCarInfoDlg.addSubmit = function() {

    const textarea = document.getElementById('introduce');
    const text = textarea.value;

    if (text.length > 1000) {
        console.log('The text is longer than 1000 characters.');
        Feng.error("门店介绍要求小于1000字")
        return
    } else {
        console.log('The text is not longer than 1000 characters.');
    }

    this.clearData();
    this.collectData();
    if(!this.validate()){
@@ -420,6 +431,17 @@
 */
TCarInfoDlg.editSubmit = function() {

    const textarea = document.getElementById('introduce');
    const text = textarea.value;

    if (text.length > 1000) {
        console.log('The text is longer than 1000 characters.');
        Feng.error("门店介绍要求小于1000字")
        return
    } else {
        console.log('The text is not longer than 1000 characters.');
    }

    this.clearData();
    this.collectData();
    if(!this.validate()){

 cloud-server-other/src/main/java/com/dsh/other/controller/BannerController.java

@@ -83,8 +83,11 @@
    public ResultUtil<List<BannerVo>> queryBannerList(Integer position){
        try {
            List<Banner> list = bannerService.list(new QueryWrapper<Banner>().eq("position", position).eq("state", 1).orderByAsc("sort"));

            List<Banner> list2 = bannerService.list1(position);

            List<BannerVo> list1 = new ArrayList<>();
            for (Banner banner : list) {
            for (Banner banner : list2) {
                BannerVo bannerVo = new BannerVo();
                BeanUtils.copyProperties(banner, bannerVo);
                list1.add(bannerVo);

 cloud-server-other/src/main/java/com/dsh/other/mapper/BannerMapper.java

@@ -27,4 +27,6 @@
    List<Banner> listAll(@Param("query") AdvertisementQuery query);

    String getFirst();

    List<Banner> list1(Integer position);
}

 cloud-server-other/src/main/java/com/dsh/other/model/BannerVo.java

@@ -16,5 +16,5 @@
    @ApiModelProperty("图片路径")
    private String img;
    @ApiModelProperty("跳转页面")
    private String jumpPage;
    private String page;
}

 cloud-server-other/src/main/java/com/dsh/other/service/IBannerService.java

@@ -24,4 +24,6 @@
    List<GetHistoryDto> gethistory(Integer studentId);

    String getFirst();

    List<Banner> list1(Integer position);
}

 cloud-server-other/src/main/java/com/dsh/other/service/impl/BannerServiceImpl.java

@@ -34,6 +34,11 @@
        return baseMapper.getFirst();
    }

    @Override
    public List<Banner> list1(Integer position) {
        return this.bannerMapper.list1(position);
    }

    @Autowired
    private BannerMapper bannerMapper;
    @Override

 cloud-server-other/src/main/java/com/dsh/other/service/impl/SiteServiceImpl.java

@@ -350,7 +350,8 @@
                payMoney = new BigDecimal(site.getPlayPaiCoinOne()).multiply(new BigDecimal(split.length)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();
            }
            if(appUser.getPlayPaiCoins().compareTo(payMoney.intValue()) < 0){
                return ResultUtil.error("玩湃币不足");

                return new ResultUtil(3,"玩湃币不足");
            }
        }else{
            payMoney = new BigDecimal(site.getCashPrice()).multiply(new BigDecimal(split.length)).setScale(2, RoundingMode.HALF_EVEN).doubleValue();

 cloud-server-other/src/main/java/com/dsh/other/util/ResultUtil.java

@@ -3,11 +3,13 @@
import com.alibaba.fastjson.JSONObject;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;

/**
 * 定义统一返回对象
 */
@ApiModel(value = "统一返回结果集")
@Data
public class ResultUtil<T> {

    public static final Integer SUCCESS = 200;
@@ -50,7 +52,7 @@
        return code;
    }

    private ResultUtil(Integer code, String msg) {
    public ResultUtil(Integer code, String msg) {
        this.code = code;
        this.msg = msg;
    }
@@ -128,6 +130,8 @@
    }




    /**
     * 运行异常
     * @return

 cloud-server-other/src/main/resources/mapper/BannerMapper.xml

@@ -49,5 +49,14 @@
            from t_img_config
            where position = 6
    </select>
    <select id="list1" resultType="com.dsh.other.entity.Banner">
                    select tb.id as id,tb.img as img, tt.name as page
                        from t_banner tb
                        left join t_turn tt on tb.jumpPage = tt.id
                    where tb.position = #{position}



    </select>

</mapper>