diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/controller/NotifyController.java b/src/main/java/com/chaozhanggui/system/cashierservice/controller/NotifyController.java
index adc35e7..3ad44f8 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/controller/NotifyController.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/controller/NotifyController.java
@@ -66,11 +66,6 @@ public class NotifyController {
 
     }
 
-    @RequestMapping("test")
-    public void test(@RequestParam String payOrderNO){
-        payService.test(payOrderNO);
-    }
-
     @RequestMapping("notifyCallBack")
     public String notifyCallBack(HttpServletRequest request){
 
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbOrderInfo.java b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbOrderInfo.java
index 60a3dcf..3f34ec1 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbOrderInfo.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/entity/TbOrderInfo.java
@@ -101,12 +101,14 @@ public class TbOrderInfo implements Serializable {
     private List<TbOrderDetail> detailList;
     private String winnnerNo;
     private String isWinner;
+    private String shopName;
 
 
     //根据状态返回 需付款 已付款 未付款 已退
     private String description;
 
-    public void setDescription() {
+    public void setDescription(String shopName) {
+        this.shopName = shopName;
         switch (status) {
             case "closed":
                 this.description = "已付款";
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
index 3455262..ccb8505 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/OrderService.java
@@ -220,9 +220,11 @@ public class OrderService {
 //        }
         PageHelper.startPage(page, size);
         List<TbOrderInfo> tbOrderInfos = orderInfoMapper.selectByUserId(userId, status);
-
+        String shopName = "";
         for (TbOrderInfo orderInfo : tbOrderInfos) {
-            orderInfo.setDescription();
+            TbShopInfo tbShopInfo = tbShopInfoMapper.selectByPrimaryKey(Integer.valueOf(orderInfo.getShopId()));
+            shopName = tbShopInfo.getShopName();
+            orderInfo.setDescription(shopName);
             List<TbOrderDetail> list = tbOrderDetailMapper.selectAllByOrderId(orderInfo.getId());
             int num = 0;
             for (TbOrderDetail orderDetail : list) {
diff --git a/src/main/java/com/chaozhanggui/system/cashierservice/service/UserService.java b/src/main/java/com/chaozhanggui/system/cashierservice/service/UserService.java
index fe9aa67..c6441e6 100644
--- a/src/main/java/com/chaozhanggui/system/cashierservice/service/UserService.java
+++ b/src/main/java/com/chaozhanggui/system/cashierservice/service/UserService.java
@@ -274,19 +274,30 @@ public class UserService {
 
     public Result openMember(OpenMemberVo memberVo) {
         TbShopUser tbShopUser = shopUserMapper.selectByUserIdAndShopId(memberVo.getId().toString(), memberVo.getShopId().toString());
-        if(tbShopUser!=null){
-            tbShopUser.setName(StringUtils.isNotBlank(memberVo.getNickName())?memberVo.getNickName():null);
-            tbShopUser.setHeadImg(StringUtils.isNotBlank(memberVo.getHeadImg())?memberVo.getHeadImg():null);
+        if (tbShopUser != null) {
+            tbShopUser.setName(StringUtils.isNotBlank(memberVo.getNickName()) ? memberVo.getNickName() : null);
+            tbShopUser.setHeadImg(StringUtils.isNotBlank(memberVo.getHeadImg()) ? memberVo.getHeadImg() : null);
             tbShopUser.setTelephone(memberVo.getTelephone());
-            tbShopUser.setBirthDay(StringUtils.isNotBlank(memberVo.getBirthDay())?memberVo.getBirthDay():null);
+            tbShopUser.setBirthDay(StringUtils.isNotBlank(memberVo.getBirthDay()) ? memberVo.getBirthDay() : null);
             tbShopUser.setIsVip(Byte.parseByte("1"));
             shopUserMapper.updateByPrimaryKeySelective(tbShopUser);
-        }else {
+        } else {
             TbUserInfo tbUserInfo = userInfoMapper.selectByPrimaryKey(memberVo.getId());
+            tbShopUser = shopUserMapper.selectPCByPhoneAndShopId(memberVo.getTelephone(), memberVo.getShopId().toString());
+            if (tbShopUser != null) {
+                tbShopUser.setName(StringUtils.isNotBlank(memberVo.getNickName()) ? memberVo.getNickName() : null);
+                tbShopUser.setHeadImg(StringUtils.isNotBlank(memberVo.getHeadImg()) ? memberVo.getHeadImg() : null);
+                tbShopUser.setTelephone(memberVo.getTelephone());
+                tbShopUser.setBirthDay(StringUtils.isNotBlank(memberVo.getBirthDay()) ? memberVo.getBirthDay() : null);
+                tbShopUser.setUserId(tbUserInfo.getId().toString());
+                tbShopUser.setMiniOpenId(tbUserInfo.getMiniAppOpenId());
+                shopUserMapper.updateByPrimaryKeySelective(tbShopUser);
+                return Result.success(CodeEnum.SUCCESS);
+            }
             tbShopUser = new TbShopUser();
-            tbShopUser.setName(StringUtils.isNotBlank(memberVo.getNickName())?memberVo.getNickName():null);
+            tbShopUser.setName(StringUtils.isNotBlank(memberVo.getNickName()) ? memberVo.getNickName() : null);
             tbShopUser.setSex(Byte.parseByte("1"));
-            tbShopUser.setBirthDay(StringUtils.isNotBlank(memberVo.getBirthDay())?memberVo.getBirthDay():null);
+            tbShopUser.setBirthDay(StringUtils.isNotBlank(memberVo.getBirthDay()) ? memberVo.getBirthDay() : null);
             tbShopUser.setLevel(Byte.parseByte("1"));
             String dynamicCode = RandomUtil.randomNumbers(8);
             tbShopUser.setCode(dynamicCode);