Merge remote-tracking branch 'origin/api_score_meger' into api_score_meger

935090232@qq.com

2021-05-08 6924e965ea3da70823f50f7285b50efab7205415

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

@@ -153,7 +153,7 @@
     * @return
     * @throws Exception
     */
    @PostMapping(value = "/moneyCardPay/{orderId}")
    @GetMapping(value = "/moneyCardPay/{orderId}")
    @ResponseBody
    @Transactional
    public   AjaxResult moneyCardPay(@PathVariable Integer orderId) throws Exception {
@@ -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);