aike/emis-api-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

md

Browse Source
This commit is contained in:
linfso 2025-06-19 18:56:05 +08:00
parent 81eb682234
commit 9d81665b02
2 changed files with 11 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
emis-api-web/src/main/java/com/xdadan/erp/apiweb/CommonController.java
View File

@ -118,7 +118,6 @@ public class CommonController extends BaseController
* @return * @return
*/ */
@RequestMapping(value = "/getLastAppVersion") @RequestMapping(value = "/getLastAppVersion")
public AjaxResult getLastAppVersion() public AjaxResult getLastAppVersion()
{ {
@ -134,8 +133,6 @@ public class CommonController extends BaseController
} }
} }
/** /**
* 获取电子面单单号 * 获取电子面单单号
*/ */
@ -158,9 +155,6 @@ public class CommonController extends BaseController
} }
} }
/** /**
* 获取解析地址 * 获取解析地址
*/ */
@ -206,8 +200,6 @@ public class CommonController extends BaseController
} }
} }
/** /**
* 预览电子面单打印 * 预览电子面单打印
*/ */
@ -255,7 +247,6 @@ public class CommonController extends BaseController
} }
return AjaxResult.success("获取成功",tplList); return AjaxResult.success("获取成功",tplList);
}catch (Exception ex){ }catch (Exception ex){
ex.printStackTrace(); ex.printStackTrace();
@ -286,7 +277,6 @@ public class CommonController extends BaseController
return AjaxResult.error("appId error!"); return AjaxResult.error("appId error!");
} }
List<Map> rstList = new ArrayList(); List<Map> rstList = new ArrayList();
Map<String,Object> rstMap = new HashMap<>(); Map<String,Object> rstMap = new HashMap<>();
rstMap.put("billCode",mainNo); rstMap.put("billCode",mainNo);
@ -317,7 +307,6 @@ public class CommonController extends BaseController
return AjaxResult.error("appId error!"); return AjaxResult.error("appId error!");
} }
List<Map> rstList = new ArrayList(); List<Map> rstList = new ArrayList();
Map<String,Object> rstMap = new HashMap<>(); Map<String,Object> rstMap = new HashMap<>();
rstMap.put("billCode",mainNo); rstMap.put("billCode",mainNo);

16
emis-api-web/src/main/java/com/xdadan/erp/apiweb/SettleBillController.java
View File

@ -116,6 +116,7 @@ public class SettleBillController extends BaseController
return AjaxResult.success(emisSettleBillService.selectEmisSettleBillById(id)); return AjaxResult.success(emisSettleBillService.selectEmisSettleBillById(id));
} }
/** /**
* 获取结算总账单详细信息 * 获取结算总账单详细信息
*/ */
@ -134,12 +135,10 @@ public class SettleBillController extends BaseController
return AjaxResult.success("成功",emisSettleBill); return AjaxResult.success("成功",emisSettleBill);
} }
@GetMapping(value = "/getWxPayQrCode") @GetMapping(value = "/getWxPayQrCode")
public AjaxResult getWxPayQrCode(EmisSettleBill emisSettleBill) public AjaxResult getWxPayQrCode(EmisSettleBill emisSettleBill)
{ {
try { try {
// String customerCode=emisSettleBill.getCustomerCode();
String qrPicUrl=emisSettleBillPayLogService.genWxPayQR(emisSettleBill.getSettleBillNo()); String qrPicUrl=emisSettleBillPayLogService.genWxPayQR(emisSettleBill.getSettleBillNo());
return AjaxResult.success("成功",qrPicUrl); return AjaxResult.success("成功",qrPicUrl);
} catch (EmisBizError emisBizError) { } catch (EmisBizError emisBizError) {
@ -152,9 +151,16 @@ public class SettleBillController extends BaseController
@PostMapping(value = "/sumbitWxPay") @PostMapping(value = "/sumbitWxPay")
public AjaxResult sumbitWxPay(@RequestBody EmisSettleBill emisSettleBill) public AjaxResult sumbitWxPay(@RequestBody EmisSettleBill emisSettleBill)
{ {
String customerCode=emisSettleBill.getCustomerCode(); // String customerCode=emisSettleBill.getCustomerCode();
emisSettleBill.setCustomerCode(customerCode); // emisSettleBill.setCustomerCode(customerCode);
return AjaxResult.success("123"); try {
String prepayId=emisSettleBillPayLogService.genWxPayFromWxApp(emisSettleBill.getSettleBillNo(),emisSettleBill.getAppId(),emisSettleBill.getOpenId());
return AjaxResult.success("成功",prepayId);
} catch (EmisBizError emisBizError) {
emisBizError.printStackTrace();
return AjaxResult.error(emisBizError.getMessage());
}
} }