修改bug

liujie

2023-10-24 d53a2b2615c207f981ca05676214cee8cfb3eebf

修改bug

 cloud-server-account/src/main/java/com/dsh/account/controller/AppUserController.java

@@ -106,6 +106,7 @@
    /**
     * 获取用户信息列表数据
     */
    @ResponseBody
    @RequestMapping("/base/appUser/listAll")
    public List<QueryAppUserVO> listAll(@RequestBody QueryAppUser query){


 cloud-server-account/src/main/java/com/dsh/account/model/query/appUserQuery/QueryAppUser.java

@@ -13,7 +13,7 @@
   private String phone;
   private Integer isVip;
   private Integer state;
   private String salesmanUser;
   private Integer salesmanUser;
   // 角色类型
   private Integer insertType;
   // 平台/运营商/门店id

 cloud-server-account/src/main/resources/mapper/TAppUserMapper.xml

@@ -66,8 +66,8 @@
            <if test="query.isVip!=null and query.isVip!= ''">
                and t1.isVip = #{query.isVip}
            </if>
            <if test="query.salesmanUserId!=null and query.salesmanUserId!= ''">
                and t1.salesmanUserId = #{query.salesmanUserId}
            <if test="query.salesmanUser!=null and query.salesmanUser!= ''">
                and t1.salesmanUserId = #{query.salesmanUser}
            </if>
            <if test="query.insertType!=null and query.insertType!= ''">
                and t1.insertType = #{query.insertType}

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

@@ -240,7 +240,7 @@
        SimpleDateFormat format = new SimpleDateFormat("yyyy-MM-dd");
        String birthday = format.format(data.get(0).getBirthday());
        model.addAttribute("birthday",birthday);
        return PREFIX + "Operator_edit.html";
        return PREFIX + "TCoach_edit.html";
    }
    /**
     * 获取教练列表

 cloud-server-management/src/main/resources/mapper/TEvaluationMapper.xml

@@ -14,8 +14,8 @@
        <if test="shopName!=null and shopName !=''">
            and t2.name like concat("%",#{shopName},"%")
        </if>
        <if test="shopName!=null and shopName !=''">
            and t2.name like concat("%",#{shopName},"%")
        <if test="name!=null and name !=''">
            and t2.name like concat("%",#{name},"%")
        </if>
    </select>
    <select id="info" resultType="com.dsh.guns.modular.system.model.TEvaluationListVo">

 cloud-server-management/src/main/webapp/WEB-INF/view/system/course/course_edit.html

@@ -75,7 +75,7 @@
            </div>
            <div class="row btn-group-m-t">
                <div class="col-sm-10">
                    <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="CourseInfo.addSubmit()"/>
                    <#button btnCss="info" name="提交" id="ensure" icon="fa-check" clickFun="CourseInfo.editSubmit()"/>
                    <#button btnCss="danger" name="取消" id="cancel" icon="fa-eraser" clickFun="CourseInfo.close()"/>
                </div>
            </div>

 cloud-server-management/src/main/webapp/static/modular/system/tGoods/tPay_info.js

@@ -48,14 +48,14 @@
                '                   </div>' +
                '</div>'

            , btn: ['关闭', '确认']
            , btn: ['确认', '关闭']
            , btnAlign: 'c' //按钮居中
            , shade: 0.5 //不显示遮罩
            , load: 1
            , yes: function () {
            , btn2: function () {
                layer.closeAll();
            },
            btn2: function () {
            yes: function () {
                console.log("看看id")
                console.log(TPayInfo.seItem.id)
                var ajax = new $ax(Feng.ctxPath + "/ticket/writeOff", function (data) {

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

@@ -81,7 +81,7 @@
        try {
            List<TGameConfig> tGameConfigs = new ArrayList<>();

            List<TGame> list = gameService.list(new LambdaQueryWrapper<TGame>().eq(TGame::getSiteId, siteId).eq(TGame::getStoreId, storeId));
            List<TGame> list = gameService.list(new LambdaQueryWrapper<TGame>().eq(TGame::getSiteId, siteId).eq(TGame::getStoreId, storeId).eq(TGame::getState,0));
            if(list.size()>0){
                Integer id = list.get(0).getId();
//                tGameConfigs = gameConfigService.list(new LambdaQueryWrapper<TGameConfig>().eq(TGameConfig::getOtherId, id));

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

@@ -391,6 +391,14 @@
            SiteBooking byId = siteBookingService.getById(id);
            Integer storeId = byId.getStoreId();
            Store byId1 = service.getById(storeId);
            Site site = siteService.getById(byId.getSiteId());

            map.put("siteName",byId1.getName());
            SiteType siteType = siteTypeService.getById(site.getSiteTypeId());
            map.put("siteType",siteType.getName());
            map.put("shopName",byId1.getName());
            map.put("shopAddress",byId1.getAddress());


            List<Integer> ids = getIds(byId.getSiteId());
            byId.setStorePhone(byId1.getPhone());

 cloud-server-other/src/main/java/com/dsh/other/entity/TGame.java

@@ -79,6 +79,8 @@
     */
    private String red;

    private Integer state;


    @Override
    protected Serializable pkVal() {

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

@@ -427,7 +427,9 @@
        siteBookingService.save(siteBooking);

        if(reservationSite.getPayType() == 1){//微信支付
            return weChatPaymentSite(payMoney, siteBooking);
            ResultUtil resultUtil = weChatPaymentSite(payMoney, siteBooking);

            return resultUtil;
        }
        if(reservationSite.getPayType() == 2){//支付宝支付
            return aliPaymentSite(payMoney, siteBooking);
@@ -452,7 +454,7 @@
    public ResultUtil weChatPaymentSite(Double paymentPrice, SiteBooking siteBooking) throws Exception{
        String code = siteBooking.getOrderNo();
        Integer id = siteBooking.getId();
        ResultUtil weixinpay = payMoneyUtil.weixinpay("预约场地", "", code, paymentPrice.toString(), "/base/site/weChatPaymentSiteCallback", "APP", "");
        ResultUtil weixinpay = payMoneyUtil.weixinpay("预约场地", id.toString(), code, paymentPrice.toString(), "/base/site/weChatPaymentSiteCallback", "APP", "");
        if(weixinpay.getCode() == 200){
            new Thread(new Runnable() {
                @Override
@@ -516,7 +518,7 @@
    public ResultUtil aliPaymentSite(Double paymentPrice, SiteBooking siteBooking) throws Exception{
        String code = siteBooking.getOrderNo();
        Integer id = siteBooking.getId();
        ResultUtil alipay = payMoneyUtil.alipay("预约场地", "预约场地", "", code, paymentPrice.toString(), "/base/site/aliPaymentSiteCallback");
        ResultUtil alipay = payMoneyUtil.alipay("预约场地", "预约场地", id.toString(), code, paymentPrice.toString(), "/base/site/aliPaymentSiteCallback");
        if(alipay.getCode() == 200){
            new Thread(new Runnable() {
                @Override
@@ -582,7 +584,9 @@
        siteBooking.setPayTime(new Date());
        siteBooking.setStatus(1);
        siteBookingService.updateById(siteBooking);
        return ResultUtil.success();
        HashMap<String, String> map = new HashMap<>();
        map.put("siteBooking",siteBooking.getId().toString());
        return ResultUtil.success(map);
    }



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

@@ -196,6 +196,7 @@
            Map<String, String> map = new HashMap<>();
            map.put("orderString", response.getBody());
            System.err.println("========map=========="+map);//就是orderString 可以直接给客户端请求，无需再做处理。
            map.put("siteBooking",passbackParams);
            return ResultUtil.success(map);
        } catch (AlipayApiException e) {
            e.printStackTrace();
@@ -423,6 +424,7 @@
                        String s1 = this.weixinSignature(map3);
                        map3.put("sign", s1);
                        System.err.println(map3);
                        map3.put("siteBookingId",attach);
                        return ResultUtil.success(map3);
                }
                return null;