Merge remote-tracking branch 'origin/feat-20220721-eidcert' into feat-20220721-eidcert

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/SysDictController.java

@@ -83,7 +83,9 @@ public class SysDictController {
 	 */
 	@GetMapping("/page")
 	public R<IPage> getDictPage(Page page, SysDict sysDict) {
-		return R.ok(sysDictService.page(page, Wrappers.query(sysDict)));
+
+		return R.ok(sysDictService.page(page, Wrappers.<SysDict>lambdaQuery().eq(StrUtil.isNotBlank(sysDict.getSystem()), SysDict::getSystem, sysDict.getSystem())
+				.like(StrUtil.isNotBlank(sysDict.getType()), SysDict::getType, sysDict.getType())));
 	}
 
 	/**

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/controller/WmPayOffController.java

@@ -185,19 +185,19 @@ public class WmPayOffController {
 	/**
 	 * 业务展示结算信息
 	 *
-	 * @param pkgId 积分包id
+	 * @param input 积分包id
 	 * @return 待提交的信息
 	 */
 	@ApiOperation(value = "结算", notes = "结算")
 	@SysLog("结算")
 	@PostMapping("/settleById")
-	public R<?> settleById(@RequestBody String pkgId) {
+	public R<?> settleById(@RequestBody WmScorePackageSettleInput input) {
 
-		if (StrUtil.isBlank(pkgId)) {
+		if (input == null || StrUtil.isBlank(input.getId())) {
 			return R.failed("积分包id缺失");
 		}
 
-		return wmPayOffService.settleById(pkgId);
+		return wmPayOffService.settleById(input.getId());
 	}