提交

src/main/java/com/gree/mall/miniapp/bean/user/UserWxBean.java

@@ -1,5 +1,6 @@
 package com.gree.mall.miniapp.bean.user;
 
+import com.gree.mall.miniapp.plus.entity.AdminWebsit;
 import com.gree.mall.miniapp.plus.entity.User;
 import com.gree.mall.miniapp.plus.entity.User;
 import io.swagger.annotations.ApiModel;
@@ -22,6 +23,8 @@ public class UserWxBean extends User {
     private ServiceWorkerBean serviceWorkerBean;
     @ApiModelProperty("网点编号")
     private String websitNumber;
-//    @ApiModelProperty("网点名称")
-//    private String websitName;
+
+
+    @ApiModelProperty("门店信息")
+    private AdminWebsit adminWebsit;
 }

src/main/java/com/gree/mall/miniapp/commonmapper/UserInfoMapper.java

@@ -2,6 +2,7 @@ package com.gree.mall.miniapp.commonmapper;
 
 import com.baomidou.mybatisplus.annotation.SqlParser;
 import com.gree.mall.miniapp.bean.user.ServiceWorkerBean;
+import com.gree.mall.miniapp.plus.entity.AdminWebsit;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
 
@@ -10,6 +11,7 @@ public interface UserInfoMapper {
     @SqlParser(filter = true)
     ServiceWorkerBean queryWebsit(@Param("userId") String userId);
     @SqlParser(filter = true)
-    ServiceWorkerBean queryWebsitByWorkId(@Param("workUserId") String workUserId,@Param("corpId") String corpId);
+    ServiceWorkerBean queryWebsitByWorkId(@Param("workUserId") String workUserId);
 
+    AdminWebsit userWebsit(@Param("userId")String userId,@Param("lng") String lng, @Param("lat")String lat);
 }

src/main/java/com/gree/mall/miniapp/config/wx/WxConfiguration.java

@@ -78,14 +78,10 @@ public class WxConfiguration {
      */
     private static void initCpService(AdminCompanyWechat companyWechat,RedisUtil redisUtil){
         Map<Integer,String> secretMap = new HashMap<>();
-        secretMap.put(companyWechat.getAgentId1(),companyWechat.getSecret1());
-        secretMap.put(companyWechat.getAgentId2(),companyWechat.getSecret2());
-        secretMap.put(companyWechat.getAgentId3(),companyWechat.getSecret3());
         for (Integer agentId : secretMap.keySet()) {
             //初始化企业微信服务
             if (Objects.nonNull(agentId)) {
                 val configStorage = new WxCpLettuceRedisConfig(redisUtil);
-                configStorage.setCorpId(companyWechat.getCorpId());
                 configStorage.setAgentId(agentId);
                 configStorage.setCorpSecret(secretMap.get(agentId));
                 WxCpService wxCpService = new WxCpServiceImpl();
@@ -126,7 +122,7 @@ public class WxConfiguration {
         WxMaService service = new WxMaServiceImpl();
         service.setWxMaConfig(config);
         wxMaService.put(companyWechat.getCompanyWechatId(),service);
-        temFhNotice.put(companyWechat.getCompanyWechatId(),companyWechat.getTemplate());
+      // temFhNotice.put(companyWechat.getCompanyWechatId(),companyWechat.getTemplate());
     }
 
 

src/main/java/com/gree/mall/miniapp/controller/user/UserController.java

@@ -12,6 +12,7 @@ import com.gree.mall.miniapp.bean.user.UserWxBean;
 import com.gree.mall.miniapp.exception.RemoteServiceException;
 import com.gree.mall.miniapp.helper.ResponseHelper;
 import com.gree.mall.miniapp.logic.user.UserLogic;
+import com.gree.mall.miniapp.plus.entity.AdminWebsit;
 import com.gree.mall.miniapp.plus.entity.OrderShare;
 import com.gree.mall.miniapp.plus.entity.User;
 import io.swagger.annotations.Api;
@@ -26,6 +27,7 @@ import org.springframework.web.bind.annotation.*;
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
 import java.util.Calendar;
+import java.util.List;
 
 @Slf4j
 @RestController
@@ -185,8 +187,39 @@ public class UserController {
 
 
 
+    @PostMapping("/userWebsit")
+    @ApiOperation(value = "获得当前用户的门店")
+    public ResponseHelper<AdminWebsit> userWebsit(
+            @ApiParam(required = true, value = "用户id") @RequestParam(required = true) String userId,
+            @ApiParam(required = true, value = "经度") @RequestParam(required = true) String lng,
+            @ApiParam(required = true, value = "纬度") @RequestParam(required = true) String lat
+    ) throws RemoteServiceException {
+        AdminWebsit adminWebsit = userLogic.userWebsit(userId,lng,lat);
+        return ResponseHelper.success(adminWebsit);
+    }
+
 
+    @PostMapping("/websitList")
+    @ApiOperation(value = "获得所有商家")
+    public ResponseHelper<List<AdminWebsit>> websitList(
+            @ApiParam(required = true, value = "经度") @RequestParam(required = true) String lng,
+            @ApiParam(required = true, value = "纬度") @RequestParam(required = true) String lat
+    ) throws RemoteServiceException {
+        List<AdminWebsit> adminWebsits = userLogic.websitList();
+        return ResponseHelper.success(adminWebsits);
+    }
 
 
+    @PostMapping("/websitUrl")
+    @ApiOperation(value = "返回营业执照")
+    public ResponseHelper<String> websitUrl(
+            HttpServletRequest request,
+            @ApiParam(value = "网点id",required = true) @RequestParam String websitId,
+            @ApiParam(value = "滑动验证key",required = false) @RequestParam(required = false) String key,
+            @ApiParam(value = "滑动验证数值",required = false) @RequestParam(required = false) String vrifyCode
+    ) throws Exception {
+        String websitUrl = userLogic.websitUrl(websitId,key, vrifyCode, request);
+        return ResponseHelper.success(websitUrl);
+    }
 
 }

src/main/java/com/gree/mall/miniapp/logic/common/UMSLogic.java

@@ -54,7 +54,7 @@ public class UMSLogic {
     private String notifyUrl;
 
     /**
-     * 云闪付
+     * 云闪付 todo
      * @param orderInfo
      * @param payment
      * @param companyWechatId
@@ -62,7 +62,7 @@ public class UMSLogic {
      * @return
      * @throws Exception
      */
-    public PayDetail payment(OrderInfo orderInfo, BigDecimal payment, String openid, String companyWechatId, OrderDetail orderDetail) throws Exception {
+/*    public PayDetail payment(OrderInfo orderInfo, BigDecimal payment, String openid, String companyWechatId, OrderDetail orderDetail) throws Exception {
         if(payment.doubleValue() <= 0){
             PayDetail payDetail = new PayDetail();
             payDetail.setIsPay(false);
@@ -147,7 +147,7 @@ public class UMSLogic {
         payDetail.setUmsMiniRep(resultObj);
         log.info("payDetail:{}",JSONObject.toJSONString(payDetail));
         return payDetail;
-    }
+    }*/
 
     /**
      * open-body-sig方式获取到Authorization 的值

src/main/java/com/gree/mall/miniapp/logic/common/WorkWechatLogic.java

@@ -27,7 +27,7 @@ public class WorkWechatLogic {
      * 小程序应用
      */
     public WxCpService miniApp(AdminCompanyWechat adminCompanyWechat){
-        WxCpService cpService = WxConfiguration.cpServices.get(adminCompanyWechat.getAgentId1());
+        WxCpService cpService = WxConfiguration.cpServices.get("");
         return cpService;
     }
 
@@ -35,7 +35,7 @@ public class WorkWechatLogic {
      * 标签应用
      */
     public WxCpService miniTagApp(AdminCompanyWechat adminCompanyWechat){
-        WxCpService cpService = WxConfiguration.cpServices.get(adminCompanyWechat.getAgentId3());
+        WxCpService cpService = WxConfiguration.cpServices.get("");
         return cpService;
     }
 

src/main/java/com/gree/mall/miniapp/logic/order/OrderLogic.java

@@ -354,7 +354,7 @@ public class OrderLogic {
             throw new RemoteServiceException("订单存在“以旧换新”活动商品，只能数量“1”单品下单");
         }
         //补充网点师傅相关信息
-        this.supplyWorkUser(orderInfo, user, currentCompanyWechat.getCorpId());
+        this.supplyWorkUser(orderInfo, user);
 
         //实际需要支付的金额(包含运费)
         BigDecimal payAmount = totalPrice.add(totalFreight);
@@ -476,7 +476,7 @@ public class OrderLogic {
         if(!orderBuyBean.getWechatPay() && (Objects.isNull(orderBuyBean.getApplyAmount()) || orderBuyBean.getApplyAmount().compareTo(BigDecimal.ZERO) <= 0)) {
             log.info("订单明细 {}, {}",JSONUtil.toJsonStr(orderDetails), isExistCode);
             OrderDetail orderDetail = isExistCode ? orderDetails.get(0) : null;
-            payDetail = umsLogic.payment(orderInfo, orderInfo.getPayAmount(), user.getOpenId(), user.getCompanyWechatId(), orderDetail);
+            //payDetail = umsLogic.payment(orderInfo, orderInfo.getPayAmount(), user.getOpenId(), user.getCompanyWechatId(), orderDetail);
         } else {
             payDetail = wechatLogic.payment(orderInfo.getOrderId(), orderInfo.getPayAmount(), user.getOpenId(),
                     profitSharingFlag, ip, user.getCompanyWechatId());
@@ -537,7 +537,7 @@ public class OrderLogic {
      * @param orderInfo
      * @param user
      */
-    private ServiceWorkerBean supplyWorkUser(OrderInfo orderInfo,User user,String corpId){
+    private ServiceWorkerBean supplyWorkUser(OrderInfo orderInfo,User user){
         if (user.getType().equals(UserTypeEnum.SERVICE.toString())) {
             orderInfo.setWorkerId(user.getWorkUserId());
             orderInfo.setWorkerName(user.getWorkName());
@@ -558,7 +558,7 @@ public class OrderLogic {
                 }
             }
         }
-        ServiceWorkerBean serviceWorkerBean = userInfoMapper.queryWebsitByWorkId(orderInfo.getWorkerId(),corpId);
+        ServiceWorkerBean serviceWorkerBean = userInfoMapper.queryWebsitByWorkId(orderInfo.getWorkerId());
         if (serviceWorkerBean != null) {
             orderInfo.setWebsitId(serviceWorkerBean.getAdminWebsitId());
             orderInfo.setWebsitNumber(serviceWorkerBean.getWebsitNumber());
@@ -634,7 +634,8 @@ public class OrderLogic {
             orderInfo.setOrderId(newOrderId);
             orderInfo.setBuyerName(buyerName);
             orderInfo.setBuyerIdCard(buyerIdCard);
-            return umsLogic.payment(orderInfo, orderInfo.getPayAmount(), user.getOpenId(), user.getCompanyWechatId(), orderDetail);
+           // return umsLogic.payment(orderInfo, orderInfo.getPayAmount(), user.getOpenId(), user.getCompanyWechatId(), orderDetail);
+            return null;
         }
     }
 
@@ -868,10 +869,7 @@ public class OrderLogic {
                     .update();
 
             final AdminCompanyWechat companyWechat = adminCompanyWechatService.getById(orderInfo.getCompanyWechatId());
-            //调php派单接口
-            if (Objects.nonNull(companyWechat) && StringUtils.isNotBlank(companyWechat.getJindCustomerNumber())) {
-                this.orderToPhp(orderInfo);
-            }
+
         }finally {
             obtain.unlock();
         }

src/main/java/com/gree/mall/miniapp/logic/renovation/RenovationLogic.java

@@ -56,7 +56,7 @@ public class RenovationLogic {
         CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat(request);
 
         AdminCompanyWechatTemplate adminCompanyWechatTemplate = adminCompanyWechatTemplateService.lambdaQuery()
-                .eq(AdminCompanyWechatTemplate::getTemplateType, currentCompanyWechat.getUseTemplate())
+                .eq(AdminCompanyWechatTemplate::getTemplateType,1)
                 .eq(AdminCompanyWechatTemplate::getCompanyWechatId, currentCompanyWechat.getCompanyWechatId()).one();
         return adminCompanyWechatTemplate;
     }

src/main/java/com/gree/mall/miniapp/logic/tag/TagLogic.java

@@ -144,7 +144,7 @@ public class TagLogic {
             externalUser.setExternalProfile(JSONObject.toJSONString(wxCpExternalContactInfoInfo.getExternalContact().getExternalProfile()));
             externalUser.setCreateTime(new Date());
             externalUser.setAddType(true);
-            externalUser.setCorpId(adminCompanyWechat.getCorpId());
+
             externalUserService.saveOrUpdate(externalUser);
             return externalUserId;
         }

src/main/java/com/gree/mall/miniapp/logic/user/PayLogic.java

@@ -191,8 +191,8 @@ public class PayLogic {
             this.addOrderShare(orderInfo, commonlyOrderDetails,1);
 
         //对接金蝶系统
-        Boolean aBoolean = fucaiLogic.sendSaleOrder(orderDetails,orderInfo,orderInfo.getWebsitNumber());
-        orderInfo.setJindSaleStatus(aBoolean);
+       // Boolean aBoolean = fucaiLogic.sendSaleOrder(orderDetails,orderInfo,orderInfo.getWebsitNumber());
+      //  orderInfo.setJindSaleStatus(aBoolean);
 
         orderInfo.updateById();
 

src/main/java/com/gree/mall/miniapp/logic/user/UserLogic.java

@@ -91,6 +91,8 @@ public class UserLogic {
     PromotionGroupSpecUserService promotionGroupSpecUserService;
     @Autowired
     UserServiceWaitService userServiceWaitService;
+    @Autowired
+    AdminWebsitService adminWebsitService;
 
     /**
      * 微信授权
@@ -266,7 +268,7 @@ public class UserLogic {
             if (wxCpUser == null) {
                 List<EnterpriseWechatWorker> list = enterpriseWechatWorkerService.lambdaQuery()
                         .eq(EnterpriseWechatWorker::getWechatUserId, workUserId)
-                        .eq(EnterpriseWechatWorker::getCorpId,currentCompanyWechat.getCorpId()).list();
+                        .eq(EnterpriseWechatWorker::getCorpId,"").list();
                 if (list.size() > 0) {
                     EnterpriseWechatWorker enterpriseWechatWorker = list.get(0);
                     wxCpUser = new WxCpUser();
@@ -368,6 +370,8 @@ public class UserLogic {
         if (user.getType().equals(UserTypeEnum.GENERAL.toString()) && service.getType().equals(UserTypeEnum.SERVICE.toString())) {
             user.setServiceId(serviceId);
             user.setServiceTime(new Date());
+            user.setWebsitId(service.getWebsitId());
+            user.setWebsitName(service.getWebsitName());
         }
 
         //判断是否为团长
@@ -595,17 +599,16 @@ public class UserLogic {
         if (user == null) {
             throw new RemoteServiceException(ResponseHelper.ResponseCode_AUTH_ERROR, "请求不合法");
         }
-        CurrentCompanyWechat currentCompanyWechat = commonLogic.getCurrentCompanyWechat(request);
-        EnterpriseWechatWorker enterpriseWechatWorker = enterpriseWechatWorkerService.lambdaQuery()
-                .eq(EnterpriseWechatWorker::getWechatUserId, user.getWorkUserId())
-                .eq(EnterpriseWechatWorker::getCorpId,currentCompanyWechat.getCorpId())
-                .one();
+
         UserWxBean userWxBean = new UserWxBean();
         BeanUtils.copyProperties(user, userWxBean);
-        userWxBean.setWorkQrcode(enterpriseWechatWorker == null ? null : enterpriseWechatWorker.getQrCode());
-        userWxBean.setWorkQrcode2(enterpriseWechatWorker == null ? null : enterpriseWechatWorker.getQrCode2());
+
         userWxBean.setShoppingCartNums(shoppingCartLogic.total(userWxBean.getUserId()));
         userWxBean.setServiceWorkerBean(userInfoMapper.queryWebsit(user.getUserId()));
+        if (!StringUtil.isEmpty(user.getWebsitId())) {
+            AdminWebsit adminWebsit = adminWebsitService.getById(user.getWebsitId());
+            userWxBean.setAdminWebsit(adminWebsit);
+        }
         return userWxBean;
     }
 
@@ -704,4 +707,63 @@ public class UserLogic {
     }
 
 
+    public AdminWebsit userWebsit(String userId, String lng, String lat) {
+        User user = userService.getById(userId);
+        if (!StringUtil.isEmpty(user.getServiceId())) {
+            AdminWebsit adminWebsit = adminWebsitService.getById(user.getWebsitId());
+            return adminWebsit;
+        }
+
+        AdminWebsit adminWebsit = userInfoMapper.userWebsit(userId, lng, lat);
+
+        if (adminWebsit == null)
+            return null;
+
+        user.setWebsitId(adminWebsit.getWebsitId());
+        user.setWebsitName(adminWebsit.getName());
+        return adminWebsit;
+    }
+
+    public List<AdminWebsit> websitList() {
+        List<AdminWebsit> adminWebsits = adminWebsitService.lambdaQuery()
+                .eq(AdminWebsit::getStatus, "ON").list();
+        return adminWebsits;
+    }
+
+    public String websitUrl(String websitId,String key, String vrifyCode, HttpServletRequest request) {
+
+        if (org.apache.commons.lang.StringUtils.isNotEmpty(key) && org.apache.commons.lang.StringUtils.isNotEmpty(vrifyCode)) {
+            boolean b = this.checkVrifyCode(key, vrifyCode);
+            if (!b) {
+                throw new RemoteServiceException("验证码不通过");
+            }
+        }
+        AdminWebsit adminWebsit = adminWebsitService.getById(websitId);
+
+        return adminWebsit.getUrl();
+    }
+
+    /**
+     * 校验验证码
+     *
+     * @param key
+     * @param vrifyCode
+     * @return
+     */
+    private boolean checkVrifyCode(String key, String vrifyCode) throws RemoteServiceException {
+        Object serverCode = redisUtil.get(Constant.RedisPrefix.VERIFICATION +":"+key);
+        if (serverCode == null) {
+            throw new RemoteServiceException("验证码超时");
+        }
+        //允许拖拽式验证码误差+-10
+        int code = (int) serverCode;
+        int code2 = Integer.parseInt(vrifyCode);
+        if (code >= (code2 - 15) && code <= (code2 + 15)) {
+            redisUtil.del(Constant.RedisPrefix.VERIFICATION +":"+key);
+            return true;
+        } else {
+            throw new RemoteServiceException("验证码校验不通过");
+        }
+    }
+
 }

src/main/resources/mapper/UserInfoMapper.xml

@@ -18,7 +18,20 @@
         from enterprise_wechat_worker eww
                  left join admin_websit aw
                            on eww.main_department = aw.websit_id and eww.corp_id = aw.corp_id
-        where eww.wechat_user_id = #{workUserId} and eww.corp_id = #{corpId}
+        where eww.wechat_user_id = #{workUserId}
+    </select>
+
+    <select id="userWebsit" resultType="com.gree.mall.miniapp.plus.entity.AdminWebsit">
+        SELECT
+        *,
+        (6371 * acos(cos(radians(#{lat})) * cos(radians(lat)) * cos(radians(lng) - radians(#{lng})) + sin(radians(#{lat})) * sin(radians(lat)))) AS distance
+        FROM
+        admin_websit
+        HAVING
+        distance &lt;= 50
+        ORDER BY
+        distance ASC
+        LIMIT 1
     </select>