支付管理-查询付款接口参数修改,mybatis拦截器配置更改

happy-cloud-wisdom/happy-cloud-wisdom-biz/src/main/java/org/jeecg/modules/utils/PayCommon.java

@@ -175,7 +175,7 @@ public class PayCommon {
             trs.put("eacnbr", hlgPaymentDetail.getCardNumber());      //账号
             trs.put("eacnam", hlgPaymentDetail.getUserName());      //户名
             //四舍五入，保留俩位小数
-            BigDecimal bg = BigDecimal.valueOf(hlgPaymentDetail.getPayment()).setScale(2, RoundingMode.HALF_UP);
+            BigDecimal bg = BigDecimal.valueOf(hlgPaymentDetail.getNetPayment()).setScale(2, RoundingMode.HALF_UP);
             trs.put("trxamt", bg.toString());      //金额
             trs.put("bnkflg", hlgPaymentDetail.getBnkflg());       //系统内标志（Y:开户行是招商银行;N：开户行是他行）
             if ("N".equals(hlgPaymentDetail.getBnkflg())) {

happy-common/happy-common-core/src/main/java/org/jeecg/config/mybatis/MybatisInterceptor.java

@@ -6,6 +6,7 @@ import org.apache.ibatis.executor.Executor;
 import org.apache.ibatis.mapping.MappedStatement;
 import org.apache.ibatis.mapping.SqlCommandType;
 import org.apache.ibatis.plugin.*;
+import org.apache.shiro.SecurityUtils;
 import org.jeecg.common.system.util.JwtUtil;
 import org.jeecg.common.system.vo.LoginUser;
 import org.jeecg.common.util.oConvertUtils;
@@ -17,167 +18,180 @@ import java.util.Properties;
 
 /**
  * mybatis拦截器，自动注入创建人、创建时间、修改人、修改时间
- * @Author scott
- * @Date  2019-01-19
  *
+ * @Author scott
+ * @Date 2019-01-19
  */
 @Slf4j
 @Component
-@Intercepts({ @Signature(type = Executor.class, method = "update", args = { MappedStatement.class, Object.class }) })
+@Intercepts({@Signature(type = Executor.class, method = "update", args = {MappedStatement.class, Object.class})})
 public class MybatisInterceptor implements Interceptor {
 
-	@Override
-	public Object intercept(Invocation invocation) throws Throwable {
-		MappedStatement mappedStatement = (MappedStatement) invocation.getArgs()[0];
-		String sqlId = mappedStatement.getId();
-		log.debug("------sqlId------" + sqlId);
-		SqlCommandType sqlCommandType = mappedStatement.getSqlCommandType();
-		Object parameter = invocation.getArgs()[1];
-		log.debug("------sqlCommandType------" + sqlCommandType);
+    @Override
+    public Object intercept(Invocation invocation) throws Throwable {
+        MappedStatement mappedStatement = (MappedStatement) invocation.getArgs()[0];
+        String sqlId = mappedStatement.getId();
+        log.debug("------sqlId------" + sqlId);
+        SqlCommandType sqlCommandType = mappedStatement.getSqlCommandType();
+        Object parameter = invocation.getArgs()[1];
+        log.debug("------sqlCommandType------" + sqlCommandType);
+
+        if (parameter == null) {
+            return invocation.proceed();
+        }
+        if (SqlCommandType.INSERT == sqlCommandType) {
+            LoginUser sysUser = this.getLoginUser();
+            Field[] fields = oConvertUtils.getAllFields(parameter);
+            for (Field field : fields) {
+                log.debug("------field.name------" + field.getName());
+                try {
+                    if ("createBy".equals(field.getName())) {
+                        field.setAccessible(true);
+                        Object local_createBy = field.get(parameter);
+                        field.setAccessible(false);
+                        if (local_createBy == null || local_createBy.equals("")) {
+                            String createBy = "admin";
+                            if (sysUser != null) {
+                                // 登录人账号
+                                createBy = sysUser.getUsername();
+                            }
+                            if (oConvertUtils.isNotEmpty(createBy)) {
+                                field.setAccessible(true);
+                                field.set(parameter, createBy);
+                                field.setAccessible(false);
+                            }
+                        }
+                    }
+                    // 注入创建时间
+                    if ("createTime".equals(field.getName())) {
+                        field.setAccessible(true);
+                        Object local_createDate = field.get(parameter);
+                        field.setAccessible(false);
+                        if (local_createDate == null || local_createDate.equals("")) {
+                            field.setAccessible(true);
+                            field.set(parameter, new Date());
+                            field.setAccessible(false);
+                        }
+                    }
+                    //注入部门编码
+                    if ("sysOrgCode".equals(field.getName())) {
+                        field.setAccessible(true);
+                        Object local_sysOrgCode = field.get(parameter);
+                        field.setAccessible(false);
+                        if (local_sysOrgCode == null || local_sysOrgCode.equals("")) {
+                            // 获取登录用户信息
+                            if (sysUser != null) {
+                                field.setAccessible(true);
+                                field.set(parameter, sysUser.getOrgCode());
+                                field.setAccessible(false);
+                            }
+                        }
+                    }
+                    //更新者
+                    if ("updateBy".equals(field.getName())) {
+                        field.setAccessible(true);
+                        Object local_updateBy = field.get(parameter);
+                        field.setAccessible(false);
+                        if (local_updateBy == null || local_updateBy.equals("")) {
+                            String updateBy = "admin";
+                            if (sysUser != null) {
+                                // 登录账号
+                                updateBy = sysUser.getUsername();
+                            }
+                            if (oConvertUtils.isNotEmpty(updateBy)) {
+                                field.setAccessible(true);
+                                field.set(parameter, updateBy);
+                                field.setAccessible(false);
+                            }
+                        }
+                    }
+                    //更新时间
+                    if ("updateTime".equals(field.getName())) {
+                        field.setAccessible(true);
+                        Object local_updateDate = field.get(parameter);
+                        field.setAccessible(false);
+                        if (local_updateDate == null || local_updateDate.equals("")) {
+                            field.setAccessible(true);
+                            field.set(parameter, new Date());
+                            field.setAccessible(false);
+                        }
+                    }
+                } catch (Exception e) {
+                }
+            }
+        }
+        if (SqlCommandType.UPDATE == sqlCommandType) {
+            LoginUser sysUser = this.getLoginUser();
+            Field[] fields = null;
+            if (parameter instanceof ParamMap) {
+                ParamMap<?> p = (ParamMap<?>) parameter;
+                //update-begin-author:scott date:20190729 for:批量更新报错issues/IZA3Q--
+                if (p.containsKey("et")) {
+                    parameter = p.get("et");
+                } else {
+                    parameter = p.get("param1");
+                }
+                //update-end-author:scott date:20190729 for:批量更新报错issues/IZA3Q-
 
-		if (parameter == null) {
-			return invocation.proceed();
-		}
-		if (SqlCommandType.INSERT == sqlCommandType) {
-			LoginUser sysUser = JwtUtil.getLoginUser();
-			Field[] fields = oConvertUtils.getAllFields(parameter);
-			for (Field field : fields) {
-				log.debug("------field.name------" + field.getName());
-				try {
-					if ("createBy".equals(field.getName())) {
-						field.setAccessible(true);
-						Object local_createBy = field.get(parameter);
-						field.setAccessible(false);
-						if (local_createBy == null || local_createBy.equals("")) {
-							String createBy = "admin";
-							if (sysUser != null) {
-								// 登录人账号
-								createBy = sysUser.getUsername();
-							}
-							if (oConvertUtils.isNotEmpty(createBy)) {
-								field.setAccessible(true);
-								field.set(parameter, createBy);
-								field.setAccessible(false);
-							}
-						}
-					}
-					// 注入创建时间
-					if ("createTime".equals(field.getName())) {
-						field.setAccessible(true);
-						Object local_createDate = field.get(parameter);
-						field.setAccessible(false);
-						if (local_createDate == null || local_createDate.equals("")) {
-							field.setAccessible(true);
-							field.set(parameter, new Date());
-							field.setAccessible(false);
-						}
-					}
-					//注入部门编码
-					if ("sysOrgCode".equals(field.getName())) {
-						field.setAccessible(true);
-						Object local_sysOrgCode = field.get(parameter);
-						field.setAccessible(false);
-						if (local_sysOrgCode == null || local_sysOrgCode.equals("")) {
-							// 获取登录用户信息
-							if (sysUser != null) {
-								field.setAccessible(true);
-								field.set(parameter, sysUser.getOrgCode());
-								field.setAccessible(false);
-							}
-						}
-					}
-					//更新者
-					if ("updateBy".equals(field.getName())) {
-						field.setAccessible(true);
-						Object local_updateBy = field.get(parameter);
-						field.setAccessible(false);
-						if (local_updateBy == null || local_updateBy.equals("")) {
-							String updateBy = "admin";
-							if (sysUser != null) {
-								// 登录账号
-								updateBy = sysUser.getUsername();
-							}
-							if (oConvertUtils.isNotEmpty(updateBy)) {
-								field.setAccessible(true);
-								field.set(parameter, updateBy);
-								field.setAccessible(false);
-							}
-						}
-					}
-					//更新时间
-					if ("updateTime".equals(field.getName())) {
-						field.setAccessible(true);
-						Object local_updateDate = field.get(parameter);
-						field.setAccessible(false);
-						if (local_updateDate == null || local_updateDate.equals("")) {
-							field.setAccessible(true);
-							field.set(parameter, new Date());
-							field.setAccessible(false);
-						}
-					}
-				} catch (Exception e) {
-				}
-			}
-		}
-		if (SqlCommandType.UPDATE == sqlCommandType) {
-			LoginUser sysUser = JwtUtil.getLoginUser();
-			Field[] fields = null;
-			if (parameter instanceof ParamMap) {
-				ParamMap<?> p = (ParamMap<?>) parameter;
-				//update-begin-author:scott date:20190729 for:批量更新报错issues/IZA3Q--
-				if (p.containsKey("et")) {
-					parameter = p.get("et");
-				} else {
-					parameter = p.get("param1");
-				}
-				//update-end-author:scott date:20190729 for:批量更新报错issues/IZA3Q-
+                //update-begin-author:scott date:20190729 for:更新指定字段时报错 issues/#516-
+                if (parameter == null) {
+                    return invocation.proceed();
+                }
+                //update-end-author:scott date:20190729 for:更新指定字段时报错 issues/#516-
 
-				//update-begin-author:scott date:20190729 for:更新指定字段时报错 issues/#516-
-				if (parameter == null) {
-					return invocation.proceed();
-				}
-				//update-end-author:scott date:20190729 for:更新指定字段时报错 issues/#516-
+                fields = oConvertUtils.getAllFields(parameter);
+            } else {
+                fields = oConvertUtils.getAllFields(parameter);
+            }
 
-				fields = oConvertUtils.getAllFields(parameter);
-			} else {
-				fields = oConvertUtils.getAllFields(parameter);
-			}
+            for (Field field : fields) {
+                log.debug("------field.name------" + field.getName());
+                try {
+                    if ("updateBy".equals(field.getName())) {
+                        String updateBy = "admin";
+                        if (sysUser != null) {
+                            // 登录账号
+                            updateBy = sysUser.getUsername();
+                        }
+                        if (oConvertUtils.isNotEmpty(updateBy)) {
+                            field.setAccessible(true);
+                            field.set(parameter, updateBy);
+                            field.setAccessible(false);
+                        }
+                    }
+                    if ("updateTime".equals(field.getName())) {
+                        field.setAccessible(true);
+                        field.set(parameter, new Date());
+                        field.setAccessible(false);
+                    }
+                } catch (Exception e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return invocation.proceed();
+    }
 
-			for (Field field : fields) {
-				log.debug("------field.name------" + field.getName());
-				try {
-					if ("updateBy".equals(field.getName())) {
-						String updateBy = "admin";
-						if (sysUser != null) {
-							// 登录账号
-							updateBy = sysUser.getUsername();
-						}
-						if (oConvertUtils.isNotEmpty(updateBy)) {
-							field.setAccessible(true);
-							field.set(parameter, updateBy);
-							field.setAccessible(false);
-						}
-					}
-					if ("updateTime".equals(field.getName())) {
-						field.setAccessible(true);
-						field.set(parameter, new Date());
-						field.setAccessible(false);
-					}
-				} catch (Exception e) {
-					e.printStackTrace();
-				}
-			}
-		}
-		return invocation.proceed();
-	}
+    @Override
+    public Object plugin(Object target) {
+        return Plugin.wrap(target, this);
+    }
 
-	@Override
-	public Object plugin(Object target) {
-		return Plugin.wrap(target, this);
-	}
+    @Override
+    public void setProperties(Properties properties) {
+        // TODO Auto-generated method stub
+    }
 
-	@Override
-	public void setProperties(Properties properties) {
-		// TODO Auto-generated method stub
-	}
+    //update-begin--Author:scott  Date:20191213 for：关于使用Quzrtz 开启线程任务， #465
+    private LoginUser getLoginUser() {
+        LoginUser sysUser = null;
+        try {
+            sysUser = SecurityUtils.getSubject().getPrincipal() != null ? (LoginUser) SecurityUtils.getSubject().getPrincipal() : null;
+        } catch (Exception e) {
+            //e.printStackTrace();
+            sysUser = null;
+        }
+        return sysUser;
+    }
+    //update-end--Author:scott  Date:20191213 for：关于使用Quzrtz 开启线程任务， #465
 }