java/xizang.git

			@@ -5,21 +5,13 @@
			import com.ruoyi.common.core.domain.R;
			import com.ruoyi.common.utils.SecurityUtils;
			import com.ruoyi.common.utils.StringUtils;
			import com.ruoyi.system.dto.BillStatisticsDto;
			import com.ruoyi.system.dto.CachPayDto;
			import com.ruoyi.system.dto.OfflinePayCheckDto;
			import com.ruoyi.system.dto.SmsByBillDto;
			import com.ruoyi.system.dto.TBillDto;
			import com.ruoyi.system.dto.TbillSaveDto;
			import com.ruoyi.system.dto.*;
			import com.ruoyi.system.model.TBillConfirm;
			import com.ruoyi.system.model.TBillDetail;
			import com.ruoyi.system.model.TContract;
			import com.ruoyi.system.query.TBillQuery;
			import com.ruoyi.system.query.TContractQuery;
			import com.ruoyi.system.service.TBillConfirmService;
			import com.ruoyi.system.service.TBillDetailService;
			import com.ruoyi.system.service.TBillService;
			import com.ruoyi.system.service.TContractService;
			import com.ruoyi.system.service.*;
			import io.swagger.annotations.Api;
			import io.swagger.annotations.ApiOperation;
			import org.springframework.beans.factory.annotation.Autowired;
			@@ -61,6 +53,8 @@

			@Autowired
			TContractService contractService;
			@Autowired
			TPayOrderService tPayOrderService;

			@PreAuthorize("@ss.hasPermi('bill:list')")
			@PostMapping("list")
			@@ -178,7 +172,12 @@
			}



			@ApiOperation(value = "创建支付订单、二维码支付")
			@PostMapping("makeOrder")
			public R<MakeOrderResp> makeOrder(@Validated @RequestBody MakeOrderDto dto){
			MakeOrderResp resp = tPayOrderService.makeOrder(dto);
			return R.ok(resp);
			}

			@@ -54,7 +54,7 @@

			@Test
			public void test(){
			String params = "{\"format\":\"json\",\"message\":{\"head\":{\"channel\":\"OPEN\",\"transCode\":\"chargeBill\",\"transFlag\":\"01\",\"transSeqNum\":\"BP250411141205A19694\",\"timeStamp\":\"20250411141205218\",\"branchCode\":\"2540\"},\"info\":{\"epayCode\":\"JF-EPAY2025030510983\",\"merchantId\":\"103882597000441\",\"traceNo\":\"JF250411141154364902\",\"input1\":\"25041114115300100000000000069356\",\"userId\":\"o4mMu5Ry-Uv3hpLt81DrXVSCe9hA\",\"amtRule\":\"0\",\"payBillCount\":\"1\",\"payBillAmt\":\"0.01\",\"payBillNo\":\"25041114115300100000000000069356\",\"payType\":\"EP139\",\"transPaySeq\":\"4BEC2514080908013408\",\"transDate\":\"20250411\",\"transTime\":\"141205\",\"settleDate\":\"20250411\",\"clearType\":\"ZHSYT\",\"resendTimes\":\"0\",\"numOpenMerchantOrder\":\"10388259700044143807189441315960\"}}}";
			String params = "{\"format\":\"json\",\"message\":{\"head\":{\"channel\":\"OPEN\",\"transCode\":\"chargeBill\",\"transFlag\":\"01\",\"transSeqNum\":\"BP250411153516A79185\",\"timeStamp\":\"20250411153516852\",\"branchCode\":\"2540\"},\"info\":{\"epayCode\":\"JF-EPAY2025030510983\",\"merchantId\":\"103882597000441\",\"traceNo\":\"JF250411153505316902\",\"input1\":\"25041115350400100000000000074347\",\"userId\":\"o4mMu5Ry-Uv3hpLt81DrXVSCe9hA\",\"amtRule\":\"0\",\"payBillCount\":\"1\",\"payBillAmt\":\"50000.00\",\"payBillNo\":\"25041115350400100000000000074347\",\"payType\":\"EP139\",\"transPaySeq\":\"4BEC2515210332857924\",\"transDate\":\"20250411\",\"transTime\":\"153516\",\"settleDate\":\"20250411\",\"clearType\":\"ZHSYT\",\"resendTimes\":\"0\",\"numOpenMerchantOrder\":\"10388259700044143857094001513707\"}}}";
			ChargeBillRequest chargeBillRequest = JSON.parseObject(params,
			new TypeReference<ChargeBillRequest>() {
			});

			@@ -670,8 +670,4 @@
			}


			@Override
			public List<ScreenRentRankVO> getStreetRentRank() {
			return null;
			}
			}

	ruoyi-admin/src/main/java/com/ruoyi/web/controller/api/TBillController.java	21 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-admin/src/test/java/com/ruoyi/web/test/BaseTest.java	2 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TBillServiceImpl.java	4 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史