Merge branch 'feat-20230710-mahpay' into temp-pre

db/v2.0/230710.sql

@@ -0,0 +1,2 @@
+alter table wm_da_agent
+    add mah_settle_flag tinyint default 0 null comment '是否允许结算';

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

@@ -845,4 +845,23 @@ public class WmDaAgentController {
 
 		return R.ok(wmDaAgentService.listByDept());
 	}
+
+	/**
+	 * MAH支付-权限配置
+	 *
+	 * @param wmDaAgent 参数
+	 * @return 结果
+	 */
+	@PostMapping("/mah-settle-config")
+	public R<?> mahSettleConfig(@RequestBody WmDaAgent wmDaAgent) {
+		if (wmDaAgent.getId() == null || wmDaAgent.getMahSettleFlag() == null) {
+			return R.failed("必填参数不能为空");
+		}
+
+		WmDaAgent update = new WmDaAgent();
+		update.setId(wmDaAgent.getId());
+		update.setMahSettleFlag(wmDaAgent.getMahSettleFlag());
+
+		return R.ok(wmDaAgentService.updateById(update));
+	}
 }

hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/entity/WmDaAgent.java

@@ -184,6 +184,11 @@ public class WmDaAgent extends Model<WmDaAgent> {
 	@ApiModelProperty(value="结算主体类型")
 	private String[] subjectType;
 
+	/**
+	 * 是否允许结算（选择“允许结算”时，相当于打开了MAH支付权限，该CSO结算时可以选择药企，走药企结算。）
+	 */
+	private Boolean mahSettleFlag;
+
 	@ApiModelProperty(value="结算主体类型和通道")
 	@TableField(exist = false)
 	private Map<String, Integer> subjectTypeAndChannel;