修正不是在线支付的退款单不需要执行退款操作

fs-danaus

2021-12-02 1691df5effffdb26ea166a6d74f2bdccd01b2c99

修正不是在线支付的退款单不需要执行退款操作

 WebRoot/demo/update1.jsp

@@ -259,7 +259,7 @@
        </div>
    </div>
    <div class="layui-form-item">
        <label class="layui-form-label">最大空闲时间</label>
        <label class="layui-form-label">最大空闲时间(秒)</label>
        <div class="layui-input-block">
            <input type="text" name="dataSourceMaxIdleTime" value="" autocomplete="off" class="layui-input">
        </div>
@@ -271,7 +271,7 @@
        </div>
    </div>
    <div class="layui-form-item">
        <label class="layui-form-label">检查空闲连接时间</label>
        <label class="layui-form-label">检查空闲连接时间(秒)</label>
        <div class="layui-input-block">
            <input type="text" name="dataSourceIdleConnectionTestPeriod" value="" autocomplete="off" class="layui-input">
        </div>

 src/com/yc/abc/service/AbcPayServiceImpl.java

@@ -42,7 +42,7 @@
        try {
            return this.jdbcTemplate.queryForObject("set nocount on\n" +
                    " select a.DocCode as newOrderNo,isnull(a.OnlineRefundAmount,0) as amount,a.OnlinePaymentDocCode as orderNo,a.onlineRefundReturnCode,b.ABCEPayType  " +
                    "     from t150109H a join t150101H b on isnull(a.OnlinePaymentDocCode,'')=b.doccode\n" +
                    "     from t150109H a left join t150101H b on isnull(a.OnlinePaymentDocCode,'')=b.doccode\n" +
                    "     where a.DocCode=? ", new BeanPropertyRowMapper<>(OrderEntity.class), docCode);
        }catch (EmptyResultDataAccessException e){
            return  null;

 src/com/yc/action/grid/GTGrid.java

@@ -5714,6 +5714,10 @@
        String temp = (page.getWhere() != null && !"".equalsIgnoreCase(page.getWhere())) ? page.getWhere().replaceAll("@~", "%").replaceAll("@_asterisk_@", "*") : "";// 3类型显示右边表格数据需要用,处理格线过滤内容存在*号
        //处理可能存在编码了的内容,@_xxxx_@
        //temp = proessFilterInfo(temp);
        if(org.apache.commons.lang3.StringUtils.isNotBlank(temp)&&!temp.trim().startsWith("and")){
            //所传条件没用括号括起来且用or连接，需要补上，因为如果后面有其他条件时，会造成查询有问题
            temp="( "+temp+" )";
        }
        String dataGroup = prossDataGroup(request, this.formID, Integer.parseInt(this.flag));
        page.setWhere(temp + (page.getFilter().length() == 0 ? "" : (temp.length() > 0 ? " and (" + page.getFilter() + ")" : "(" + page.getFilter() + ")")) + page.getDataformid() + page.getType() + dataGroup);
        return page;

 src/com/yc/open/mutual/schedule/AbcPayGate.java

@@ -48,11 +48,11 @@
                 abcPayServiceIfc = (AbcPayServiceIfc) FactoryBean.getBean("abcPayServiceImpl");
                OrderEntity orderEntity=abcPayServiceIfc.get150109(gateEntity.getDocCode());
                if(orderEntity!=null) {
                    if(StringUtils.isBlank(orderEntity.getOrderNo())){//orderEntity.OrderNo在这里是表示收款单单号
                        throw new ApplicationException("退款对应的收款单据不存在");
                    }
                    if(orderEntity.getAmount().doubleValue()>0) {
                        //退款金额>0才执行退款操作
                        if(StringUtils.isBlank(orderEntity.getOrderNo())){//orderEntity.OrderNo在这里是表示收款单单号
                            throw new ApplicationException("退款对应的收款单据不存在");
                        }
                        orderEntity.setDbid(gateEntity.getDbid());
                        //-----根据支付类型调用不同API接口
                        AbcPayUtils.postRefundOrder(orderEntity);

 src/com/yc/service/grid/GridServiceImpl.java

@@ -762,11 +762,11 @@
        while (propsMatcher.find()) {
            orgFields=orgFields.replace(propsMatcher.group(),"");
        }
       String orderby=orderField.split(";")[0];
        fields=fields.replaceAll("','","'~p~'");
        List<String> list =Arrays.asList(fields.split(","));
        fields=list.stream().distinct().collect(Collectors.joining(","));
        fields=fields.replaceAll("'~p~'","','");
        String orderby=fields.split(",")[0];

        String newSql="set nocount on \n" +
                " declare @Limit int = ? , @Page int = ?,@StartRowNo int ,@EndRowNo int ;"