收银呗改为快银收银，部分调整

pluss-wap-page/src/main/java/cn/pluss/platform/controller/home/WechantController.java

@@ -7,6 +7,7 @@ import java.math.BigDecimal;
 import java.text.SimpleDateFormat;
 import java.util.*;
 
+import javax.annotation.Resource;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
@@ -15,6 +16,7 @@ import cn.pluss.platform.api.ResultGenerator;
 import cn.pluss.platform.constants.Constant;
 import cn.pluss.platform.entity.*;
 import cn.pluss.platform.exception.MsgException;
+import cn.pluss.platform.merchant.MerchantBaseInfoService;
 import cn.pluss.platform.merchantStore.MerchantStoreService;
 import cn.pluss.platform.pay.ApiPayService;
 import cn.pluss.platform.systemConfig.SystemConfigService;
@@ -78,7 +80,8 @@ public class WechantController {
 
 	@Setter(onMethod_ = {@Autowired})
 	private RestTemplate restTemplate;
-
+	@Resource
+	private MerchantBaseInfoService merchantBaseInfoService;
 	/**
 	 *
 	 * goUpgradePage:(跳转到升级页面). <br/>
@@ -405,6 +408,8 @@ public class WechantController {
 							merchantMenberService.updateMerchantMenber(merchantMenber);
 							try {
 								MerchantStore store = merchantStoreService.getStoreByMerchantCode(merchantMenber.getMerchantCode());
+								MerchantBaseInfo merchantBaseInfo = new MerchantBaseInfo();
+								merchantBaseInfo = merchantBaseInfoService.queryMerchantBaseInfo(queryMerchantBaseInfo);
 								JSONObject miniprogram = new JSONObject();
 								miniprogram.put("appid",ParametersUtil.APPLETS_APPID);
 								miniprogram.put("pagepath","yb_o2ov2/vip/my-vip?syb_m_id="+store.getId()+"&phone="+merchantMenber.getPhone());