Merge branch 'score_shop' of http://120.27.238.55:7000/r/beauty-erp into sc...

Helius

2021-04-19 6922917abd80d12a5d87cc2f8d0390c55694a95a

 zq-erp/src/main/java/com/matrix/system/shopXcx/api/action/WXShopOrderAction.java

@@ -216,7 +216,7 @@
                    }
                    shopActivitiesGroupJoinDao.updateByModel(groupJoin);

                    SysVipInfo sysVipInfo = sysVipInfoDao.selectByPhone(order.getUserTel());
                    SysVipInfo sysVipInfo = sysVipInfoDao.selectByPhone(order.getUserTel(),order.getCompanyId());
                    if (sysVipInfo != null) {
                        sysVipInfo.setIsDeal(SysVipInfo.DEAL_VIP);
                        sysVipInfoDao.update(sysVipInfo);