fix 免登录支付；pc应用微信扫码；后台平台规格查询

netflix-dao/src/main/java/com/cyksj/model/request/OrderPayRequest.java

@@ -80,7 +80,7 @@ public class OrderPayRequest {
      */
     private Long infoId;
 
-    private Boolean isNoLogin;
+    private Boolean isNoLogin = false;
 
     /**
      * 登录推广 不需要校验未支付订单订单

netflix-service/src/main/java/com/cyksj/service/wechat/impl/WeChatServiceImpl.java

@@ -581,7 +581,7 @@ public class WeChatServiceImpl implements WeChatService {
     @Override
     public String createWxAuthLoginUrl(String state, String appId, String redirectUri) {
         String authLoginUrl = String.format("https://open.weixin.qq.com/connect/qrconnect?" +
-                "appid=%s&redirect_uri=%s&response_type=code&scope=snsapi_login&state=%s#wechat_redirect", appId, redirectUri, state);
+                "appid=%s&redirect_uri=%s&response_type=code&fast_login=0&scope=snsapi_login&state=%s#wechat_redirect", appId, redirectUri, state);
         return authLoginUrl;
     }
 

netflix-web/src/main/java/com/cyksj/web/controller/manage/goods/CmsGoodsDonSkuController.java

@@ -220,16 +220,25 @@ public class CmsGoodsDonSkuController {
      * 获取平台规格列表
      */
     @GetMapping("/get/list")
-    public Result<SearchResult<GoodsDonSku>> getGoodsSkuList(@RequestParam(defaultValue = "0") Boolean filterPack) {
+    public Result<SearchResult<GoodsDonSku>> getGoodsSkuList(@RequestParam(defaultValue = "0") Boolean filterPack, Integer specId) {
         MapBuilder builder = MapUtils.flatBuilder(request.getParameterMap());
+        String condition = StrUtil.EMPTY;
         if (filterPack) {
-            String condition = " spec_json not like '%套餐%'";
+            condition = " spec_json not like '%套餐%'";
+        }
+        if (specId != null) {
+            if (StrUtil.isNotBlank(condition)) {
+                condition += " and ";
+            }
+            condition += String.format("JSON_CONTAINS(spec_ids, '%s')", specId);
+        }
+        if (StrUtil.isNotBlank(condition)) {
             builder.put("condition", condition);
         }
         SearchResult<GoodsDonSku> skuViewList = beanSearcher.search(GoodsDonSku.class, builder
                 .orderBy(GoodsDonSku::getSorted).orderBy(GoodsDonSku::getCreatedTime).desc()
                 .build());
-        skuViewList.getDataList().forEach(sku->{
+        skuViewList.getDataList().forEach(sku -> {
             if (sku.getIsDp()) {
                 sku.setDpSku(beanSearcher.searchAll(GoodsDiscountPlusPurchaseRelation.class, MapUtils.builder()
                         .field(GoodsDiscountPlusPurchaseRelation::getSkuId, sku.getId())

netflix-web/src/main/java/com/cyksj/web/controller/payment/OrderController.java

@@ -172,6 +172,11 @@ public class OrderController {
         }
         payRequest.setIp(ip);
 
+        //非推广 免登录
+        if (payRequest.getPopularizeId() == null && payRequest.getIsNoLogin()) {
+            throw BusinessRuntimeException.getGatewayApiCode(GatewayApiCode.CMS_TOKEN_VALID);
+        }
+
         OrderDon orderDon = orderDonService.submit(payRequest);
 
         //无登录订单 预留手机号免登录