Browse Source

Merge branch 'release_real_202010' of https://git.malls.iformall.com/server/formallProject into release_real_202010

release_toaliyun_real
xhxu 5 years ago
parent
commit
f795abac0c
2 changed files with 16 additions and 10 deletions
  1. +2
    -1
      mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java
  2. +14
    -9
      mybatis-multi-tenancy/src/main/java/com/iformall/plugin/shard/plugin/ShardingSpherePlugin.java

+ 2
- 1
mallinkService/src/main/java/com/iformall/service/impl/WxOrderServiceImpl.java View File

@@ -1047,6 +1047,7 @@ public class WxOrderServiceImpl implements WxOrderService {
//TODO 如果orderId已经存在,则不再添加
WxCouponOrder couponOrderQ = new WxCouponOrder();
couponOrderQ.setOrderId(order.getId());
couponOrderQ.updateTenantInfo(order);
WxCouponOrder couponOrder = null;
List<WxCouponOrder> couponorderlist = wxCouponOrderMapper.findList(couponOrderQ);
if (null != couponorderlist && couponorderlist.size() > 0 ) {
@@ -1242,7 +1243,7 @@ public class WxOrderServiceImpl implements WxOrderService {
try {
user = wxCUserBasicInfoMapper.selectById(userId,tenantinfo.getFinalTenantId());
} catch (Exception e) {
logger.error("userId : " + userId + ", e: " + e.getMessage());
logger.error("userId : " + userId + ", e: " + e.getMessage(),e);
}
if (user == null) {
logger.error("用户不存在, userId: " + userId);


+ 14
- 9
mybatis-multi-tenancy/src/main/java/com/iformall/plugin/shard/plugin/ShardingSpherePlugin.java View File

@@ -222,16 +222,21 @@ public class ShardingSpherePlugin implements MyBatisPlus {
if (null == column) {
throw new RuntimeException("table sharinding error column is null");
}
String[] field = column.split("_");
String fieldName = "";
if (null != field && field.length > 0) {
for (String f : field) {
fieldName = fieldName + f.substring(0,1).toUpperCase()+f.substring(1);
try {
System.out.println("column>>>>>>>>>>>>>"+column);
String[] field = column.split("_");
String fieldName = "";
if (null != field && field.length > 0) {
for (String f : field) {
fieldName = fieldName + f.substring(0,1).toUpperCase()+f.substring(1);
}
}else {
fieldName = column.substring(0,1).toUpperCase()+column.substring(1);
}
}else {
fieldName = column.substring(0,1).toUpperCase()+column.substring(1);
}
return fieldName;
return fieldName;
}catch(Exception e) {
throw new RuntimeException(e);
}
}
private boolean isBasicTypeValue(Object parameterObject) {


Loading…
Cancel
Save