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/WxCommonAction.java

@@ -159,12 +159,12 @@
                            //设置支付状态为支付成功
                            modifyMap.put("payStatus", ShopOrder.ORDER_PAY_STATUS_SUCCESS);
                            //设置订单状态
                            if (ShopOrder.ORDER_TYPE_GOODS == order.getOrderType()) {
                            if (ShopOrder.SHIPPING_METHOD_WL == order.getShippingMethod()) {
                                //如果是商品订单则进入待发货
                                modifyMap.put("orderStatus", ShopOrder.ORDER_STATUS_WAIT_SEND);
                            } else {
                                //如果是服务订单则进入待评价
                                modifyMap.put("orderStatus", ShopOrder.ORDER_STATUS_WAIT_REMARK);
                            } else if (ShopOrder.SHIPPING_METHOD_MDZT == order.getShippingMethod()) {
                                //如果是门店自提则进入待收款
                                modifyMap.put("orderStatus", ShopOrder.ORDER_STATUS_WAIT_RECEIVE);
                            }
                            shopOrderDao.updateByMap(modifyMap);

@@ -187,7 +187,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);