Browse Source

feat: 中智结算调通2

李学松 2 years ago
parent
commit
cd3e62b0a2

+ 1 - 1
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/GigThirdApiController.java

@@ -103,7 +103,7 @@ public class GigThirdApiController {
 		if (Boolean.FALSE.equals(absent)) {
 			log.warn("存在在途操作orderNo={}", thirdOrderNo);
 			result.put("code", "00000400");
-			result.put("msg", "成功");
+			result.put("msg", "存在在途操作");
 			return result;
 		}
 

+ 1 - 1
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/entity/ZhongzhiInputRecord.java

@@ -36,7 +36,7 @@ public class ZhongzhiInputRecord implements Serializable {
     /**
      * 三方订单号
      */
-	@TableField(value = "orderNo")
+	@TableField(value = "order_no")
     private String thirdOrderNo;
 
     /**

+ 4 - 4
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/service/gig/impl/GigThirdApiServiceImpl.java

@@ -95,16 +95,16 @@ public class GigThirdApiServiceImpl implements GigThirdApiService {
 	 */
 	@Override
 	public boolean zhongzhiSettleNotify(JSONObject bodyJson) {
-		// 平台任务编
-		String orderNo = bodyJson.getStr("orderNo");
+		// 三方订单
+		String thirdOrderNo = bodyJson.getStr("thirdOrderNo");
 		// 支付结果,SUCCESS成功,FAIL失败
 		String payResult = bodyJson.getStr("payResult");
 
 		// 根据orderNo查询结算单
 		List<WmScorePackageSettleNote> settleNoteList = scorePackageSettleNoteService.list(Wrappers.<WmScorePackageSettleNote>lambdaQuery()
-				.eq(WmScorePackageSettleNote::getStreamId, orderNo));
+				.eq(WmScorePackageSettleNote::getStreamId, thirdOrderNo));
 		if (CollUtil.isEmpty(settleNoteList)) {
-			log.warn("订单orderNo={}对应结算单不存在", orderNo);
+			log.warn("订单thirdOrderNo={}对应结算单不存在", thirdOrderNo);
 			return false;
 		}