bug修改

无关风月

4 天以前 31755963171a6c7b7fdc286d83882daac6d9310b

bug修改

 cloud-server-competition/src/main/resources/mapper/PaymentCompetitionMapper.xml

@@ -66,7 +66,7 @@
        select * from t_payment_competition t1
        <where>
            <if test="query.amount!=null and query.amount!= ''">
                and t1.amount &lt;= #{query.amount}
                and t1.amount = #{query.amount}
            </if>
            <if test="query.userIds != null and query.userIds.size()>0">
                AND t1.competitionId IN
@@ -77,6 +77,7 @@
            <if test="sTime !=null and sTime!= '' and eTime !=null and eTime!= ''">
                and t1.insertTime between #{sTime} and #{eTime}
            </if>
        and t1.payStatus = 2
        </where>
    </select>
    <select id="queryBycode" resultType="java.lang.Integer">

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

@@ -348,7 +348,7 @@
                    temp.setStoreName("");
                    temp.setAmount(new BigDecimal(vipPayment.getAmount().toString()));
                    temp.setIncomeType(1);
                    temp.setState(vipPayment.getState());
                    temp.setState(2);
                    temp.setInsertTime(vipPayment.getInsertTime());
                    if (UserExt.getUser().getObjectType()!=1){
                        break;
@@ -382,7 +382,7 @@
                        temp.setAmount(rechargeRecordsVO.getAmount());
                    }
                    temp.setIncomeType(2);
                    temp.setState(rechargeRecordsVO.getPayStatus());
                    temp.setState(2);

                    incomeVOS.add(temp);
                }
@@ -415,12 +415,9 @@
                        temp.setAmount(registerOrderVO.getMoney());
                    }
                    temp.setIncomeType(3);
                    if (registerOrderVO.getPayStatus() == 1){

                        temp.setState(2);
                    }
                    if (registerOrderVO.getPayStatus() == 2){
                        temp.setState(1);
                    }

                    incomeVOS.add(temp);
                }
            }
@@ -470,11 +467,9 @@
                            temp.setAmount(new BigDecimal(competition.getAmount().toString()));
                        }
                        temp.setIncomeType(4);
                        if (competition.getPayStatus() == 1){

                            temp.setState(2);
                        }else if (competition.getPayStatus() == 2){
                            temp.setState(1);
                        }

                        incomeVOS.add(temp);
                    }
                }
@@ -484,11 +479,9 @@
                List<SiteBooking> siteBookings = siteClient.listAll(siteBookingQuery);
                for (SiteBooking siteBooking : siteBookings) {
                    IncomeVO temp = new IncomeVO();
                    if (siteBooking.getStatus() == 0 || siteBooking.getStatus() == 5 || siteBooking.getStatus() == 4) {
                        temp.setState(1);
                    } else {

                        temp.setState(2);
                    }

                    TAppUser tAppUser = appUserClient.queryAppUser1(siteBooking.getAppUserId());
                    Store store = storeClient.getStoreById(siteBooking.getStoreId());

@@ -529,7 +522,7 @@
                    temp.setPhone(worldCupIncomeVO.getPhone());
                    temp.setAmount(new BigDecimal(worldCupIncomeVO.getAmount()));
                    temp.setIncomeType(6);
                    temp.setState(1);
                    temp.setState(2);
                    temp.setInsertTime(simpleDateFormat.parse(worldCupIncomeVO.getPayTime()));
                    incomeVOS.add(temp);
                }
@@ -637,7 +630,7 @@
                temp.setStoreName("");
                temp.setAmount(new BigDecimal(vipPayment.getAmount().toString()));
                temp.setIncomeType(1);
                temp.setState(vipPayment.getState());
                temp.setState(2);
                temp.setInsertTime(vipPayment.getInsertTime());
                if (UserExt.getUser().getObjectType()!=1){
                    break;
@@ -671,8 +664,7 @@
                    temp.setAmount(rechargeRecordsVO.getAmount());
                }
                temp.setIncomeType(2);
                temp.setState(rechargeRecordsVO.getPayStatus());

                temp.setState(2);
                incomeVOS.add(temp);
            }
        }
@@ -686,11 +678,9 @@
                TAppUser tAppUser = appUserClient.queryById(registerOrderVO.getAppUserId());
                IncomeVO temp = new IncomeVO();
                temp.setId(registerOrderVO.getId().toString());
                if (registerOrderVO.getPayStatus()==2) {
                    temp.setState(2);
                } else {
                    temp.setState(1);
                }

                temp.setState(2);

                if (tAppUser!=null){
                    if (tAppUser.getProvince()!=null){
                        temp.setProvince(tAppUser.getProvince());
@@ -709,7 +699,7 @@
                    temp.setAmount(registerOrderVO.getMoney());
                }
                temp.setIncomeType(3);
                temp.setState(registerOrderVO.getPayStatus());
                temp.setState(2);
                incomeVOS.add(temp);
            }
        }
@@ -742,11 +732,9 @@

                        temp.setStoreName(substring);
                    }
                    if (competition.getPayStatus()==2) {

                        temp.setState(2);
                    } else {
                        temp.setState(1);
                    }

                    temp.setId(competition.getId().toString());
                    if (tAppUser!=null){
                        if (tAppUser.getProvince()!=null){
@@ -763,7 +751,7 @@
                        temp.setAmount(new BigDecimal(competition.getAmount().toString()));
                    }
                    temp.setIncomeType(4);
                    temp.setState(competition.getPayStatus());
                    temp.setState(2);
                    incomeVOS.add(temp);
                }
            }
@@ -772,11 +760,7 @@
            List<SiteBooking> siteBookings = siteClient.listAll(siteBookingQuery);
            for (SiteBooking siteBooking : siteBookings) {
                IncomeVO temp = new IncomeVO();
                if (siteBooking.getStatus() == 0 || siteBooking.getStatus() == 5 || siteBooking.getStatus() == 4) {
                    temp.setState(1);
                } else {
                    temp.setState(2);
                }
                temp.setState(2);
                TAppUser tAppUser = appUserClient.queryAppUser1(siteBooking.getAppUserId());
                Store store = storeClient.getStoreById(siteBooking.getStoreId());

@@ -816,7 +800,7 @@
                temp.setPhone(worldCupIncomeVO.getPhone());
                temp.setAmount(new BigDecimal(worldCupIncomeVO.getAmount()));
                temp.setIncomeType(6);
                temp.setState(1);
                temp.setState(2);
                temp.setInsertTime(simpleDateFormat.parse(worldCupIncomeVO.getPayTime()));
                incomeVOS.add(temp);
            }

 cloud-server-management/src/main/webapp/static/modular/system/finance/income.js

@@ -30,7 +30,7 @@
        },
        {title:  '状态', field: 'state', visible: true, align: 'center', valign: 'middle',
            formatter:function (data) {
                return{1:"已支付",2:"未支付"}[data]
                return{1:"未支付",2:"已支付"}[data]
            }
        },
    ];

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

@@ -41,6 +41,7 @@
            <if test="sTime !=null and sTime!= '' and eTime !=null and eTime!= ''">
                and t1.insertTime between #{sTime} and #{eTime}
            </if>
        and t1.status !=0 and t1.status !=5
        </where>
    </select>
    <select id="queryByCode" resultType="java.lang.Integer">