Преглед изворни кода

[停车][修改]:处理一次进出场,多次缴费的情况

release_toaliyun_real
Stormeye Wu пре 6 година
родитељ
комит
6c5262d865
6 измењених фајлова са 18 додато и 11 уклоњено
  1. +2
    -0
      mallinkAdmin/src/main/resources/db/migration/V201907191230__CAR_DATA.sql
  2. +5
    -3
      mallinkCallback/src/main/java/com/iformall/controller/callback/WxCarCallBackController.java
  3. +1
    -1
      mallinkService/src/main/java/com/iformall/mapper/WxCarCmdLogMapper.java
  4. +1
    -1
      mallinkService/src/main/java/com/iformall/service/WxCarCmdLogService.java
  5. +2
    -2
      mallinkService/src/main/java/com/iformall/service/impl/WxCarCmdLogServiceImpl.java
  6. +7
    -4
      mallinkService/src/main/resources/mapper/WxCarCmdLogMapper.xml

+ 2
- 0
mallinkAdmin/src/main/resources/db/migration/V201907191230__CAR_DATA.sql Прегледај датотеку

@@ -0,0 +1,2 @@
alter table wx_car_cmd_log
add column fee_time VARCHAR(50) GENERATED ALWAYS AS (`cmd_json` ->> '$.time') NULL;

+ 5
- 3
mallinkCallback/src/main/java/com/iformall/controller/callback/WxCarCallBackController.java Прегледај датотеку

@@ -319,6 +319,7 @@ public class WxCarCallBackController extends BaseController {

// 根据orderId获取入场信息,确定租户ID
String orderId = paramMap.get(ETCPUtil.ETCP_ORDER_ID);
String etcpTime = paramMap.get(ETCPUtil.ETCP_TIME);
HashMap<String, String> map = new HashMap<String, String>();
map.put("synId", orderId);
String tenantId = wxCarCmdLogService.getTenantIdBySynId(map);
@@ -326,8 +327,9 @@ public class WxCarCallBackController extends BaseController {
// 检查是否有重复数据
map.put("tenantId", tenantId);
map.put("orderId", orderId);
Long count = wxCarCmdLogService.getCountByOrderId(map);
if(count > 0) {
map.put("feeTime", etcpTime);
WxCarCmdLog carCmdLog = wxCarCmdLogService.getByOrderId(map);
if(carCmdLog != null) {
logger.error("ETCP order已入库: " + orderId);
return new Result(EnumETCPCode.SUCCESS.getCode(), EnumETCPCode.SUCCESS.getMessage());
}
@@ -350,7 +352,7 @@ public class WxCarCallBackController extends BaseController {
}

String paidServiceFee = paramMap.get(ETCPUtil.ETCP_PAID_SERVICE_FEE);
String etcpTime = paramMap.get(ETCPUtil.ETCP_TIME);
String fee = paramMap.get("fee");

try {


+ 1
- 1
mallinkService/src/main/java/com/iformall/mapper/WxCarCmdLogMapper.java Прегледај датотеку

@@ -28,7 +28,7 @@ public interface WxCarCmdLogMapper extends CommonMapper<WxCarCmdLog, Long> {

Long queryWeekCarPayCount(HashMap<String,Object> params);

Long countPaidInfoByOrderId(HashMap<String,String> params);
WxCarCmdLog queryByOrderId(HashMap<String,String> params);

Long countBySynId(HashMap<String,Object> params);
}

+ 1
- 1
mallinkService/src/main/java/com/iformall/service/WxCarCmdLogService.java Прегледај датотеку

@@ -50,7 +50,7 @@ public interface WxCarCmdLogService {
*/
String getTenantIdBySynId(HashMap<String, String> params);

Long getCountByOrderId(HashMap<String, String> params);
WxCarCmdLog getByOrderId(HashMap<String, String> params);

Long getCountBySynId(HashMap<String, Object> params);



+ 2
- 2
mallinkService/src/main/java/com/iformall/service/impl/WxCarCmdLogServiceImpl.java Прегледај датотеку

@@ -61,8 +61,8 @@ public class WxCarCmdLogServiceImpl implements WxCarCmdLogService {
}

@Override
public Long getCountByOrderId(HashMap<String, String> params) {
return wxCarCmdLogMapper.countPaidInfoByOrderId(params);
public WxCarCmdLog getByOrderId(HashMap<String, String> params) {
return wxCarCmdLogMapper.queryByOrderId(params);
}

@Override


+ 7
- 4
mallinkService/src/main/resources/mapper/WxCarCmdLogMapper.xml Прегледај датотеку

@@ -127,15 +127,18 @@
where cmd_type = 601 and syn_id = #{synId}
</select>

<select id="countPaidInfoByOrderId" parameterType="hashmap" resultType="Long">
select count(id)
<select id="queryByOrderId" parameterType="hashmap" resultType="com.iformall.domain.po.WxCarCmdLog">
select *
from wx_car_cmd_log
where cmd_type = 604
<if test=" null != tenantId">
and tenant_id = #{tenantId}
and tenant_id = #{tenantId}
</if>
<if test=" null != orderId">
and order_id = #{orderId}
and order_id = #{orderId}
</if>
<if test=" null != feeTime">
and fee_time = #{feeTime}
</if>
</select>



Loading…
Откажи
Сачувај