yixian
6 years ago
parent
a4bfebe22a
commit
0d48030501
@ -1,14 +1,24 @@
|
||||
<?xml version="1.0" encoding="UTF-8" ?>
|
||||
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd" >
|
||||
<mapper namespace="au.com.royalpay.payment.manage.mappers.payment.TaskManualSettleMapper">
|
||||
<update id="rollbackExecutedTask">
|
||||
UPDATE task_client_manual_settle s
|
||||
INNER JOIN log_clearing_detail d ON d.clear_detail_id = s.clearing_order
|
||||
SET s.finish_time = NULL, s.clearing_order = NULL
|
||||
WHERE d.clearing_id = #{clearing_id}
|
||||
</update>
|
||||
<select id="getEveryLatestRecord" resultType="com.alibaba.fastjson.JSONObject">
|
||||
SELECT
|
||||
s.request_time,c.client_id,c.client_moniker
|
||||
SELECT
|
||||
s.request_time,
|
||||
c.client_id,
|
||||
c.client_moniker
|
||||
FROM
|
||||
task_client_manual_settle s
|
||||
right join sys_clients c on s.client_id = c.client_id
|
||||
inner join sys_client_config cc on cc.client_id = c.client_id
|
||||
where (s.request_time=(select max(B.request_time) from task_client_manual_settle B where s.client_id =B.client_id) or s.request_time is null)
|
||||
and cc.manual_settle = 1
|
||||
task_client_manual_settle s
|
||||
right join sys_clients c on s.client_id = c.client_id
|
||||
inner join sys_client_config cc on cc.client_id = c.client_id
|
||||
where (s.request_time = (select max(B.request_time)
|
||||
from task_client_manual_settle B
|
||||
where s.client_id = B.client_id) or s.request_time is null)
|
||||
and cc.manual_settle = 1
|
||||
</select>
|
||||
</mapper>
|
||||
@ -0,0 +1,24 @@
|
||||
<div class="modal-header">
|
||||
<h4>Distribute Bank</h4>
|
||||
</div>
|
||||
<div class="modal-body">
|
||||
<div class="form-horizontal">
|
||||
<div class="form-group" ng-repeat="cfg in bankData">
|
||||
<label class="control-label col-xs-2" ng-bind="cfg.bank"></label>
|
||||
<div class="col-xs-9">
|
||||
<input class="form-control" type="number" ng-model="cfg.amount">
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<label class="control-label col-xs-2" ng-bind="banksConfig.remains_to"></label>
|
||||
<div class="col-xs-9">
|
||||
<p class="form-control-static" ng-bind="remainingAmount()"></p>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="alert alert-danger" ng-if="errmsg" ng-bind="errmsg"></div>
|
||||
</div>
|
||||
<div class="modal-footer">
|
||||
<button class="btn btn-primary" ng-click="submitDistribution()">Submit</button>
|
||||
<button class="btn btn-danger" ng-click="$dismiss()">Cancel</button>
|
||||
</div>
|
||||
@ -1,27 +0,0 @@
|
||||
package au.com.royalpay.payment.manage.apps.core.impls;
|
||||
|
||||
import au.com.royalpay.payment.manage.apps.core.CustomerImpressionService;
|
||||
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.springframework.boot.test.context.SpringBootTest;
|
||||
import org.springframework.test.context.ActiveProfiles;
|
||||
import org.springframework.test.context.junit4.SpringRunner;
|
||||
|
||||
import javax.annotation.Resource;
|
||||
|
||||
/**
|
||||
* Created by wangning on 08/01/2018.
|
||||
*/
|
||||
@SpringBootTest
|
||||
@ActiveProfiles({"local","alipay","wechat","jd","bestpay"})
|
||||
@RunWith(SpringRunner.class)
|
||||
public class CustomerImpressionServiceImplTest {
|
||||
@Resource
|
||||
private CustomerImpressionService customerImpressionService;
|
||||
@Test
|
||||
public void generate() throws Exception {
|
||||
customerImpressionService.generate(9);
|
||||
}
|
||||
|
||||
}
|
||||
Loading…
Reference in new issue