imcs-bt-be/imcs-authority-server/src/main/java/com/github/zuihou/api/AndroidApi.java

@@ -95,7 +95,6 @@ public class AndroidApi {
     private MemberService memberService;
 
 
-
     @ApiOperation("获取商品列表")
     @GetMapping({"/goodsList"})
     public R<List<EquGoodsDto>> goodsList(@RequestParam(name = "equId", required = true) Long equId) {
@@ -276,20 +275,22 @@ public class AndroidApi {
             QueryWrap<Formula> formulaQueryWrap = new QueryWrap<>();
             formulaQueryWrap.eq("formula_spe_id", localOrder.getOrderSpecs());
             List<Formula> formulaList = formulaService.list(formulaQueryWrap);
-            formulaList.forEach(item -> {
-                QueryWrap<EquBarrel> barrelQueryWrap = new QueryWrap<>();
-                barrelQueryWrap.eq("mtr_id", item.getFormulaMtId());
-                barrelQueryWrap.eq("equ_id", equId);
-                List<EquBarrel> list = barrelService.list(barrelQueryWrap);
-                if (null != list&&list.size()>0) {
-                    item.setBarrelCode(list.get(0).getBarrelCode());
-                }
-
-            });
+            if (formulaList != null && formulaList.size() > 0) {
+                formulaList.forEach(item -> {
+                    QueryWrap<EquBarrel> barrelQueryWrap = new QueryWrap<>();
+                    barrelQueryWrap.eq("mtr_id", item.getFormulaMtId());
+                    barrelQueryWrap.eq("equ_id", equId);
+                    List<EquBarrel> list = barrelService.list(barrelQueryWrap);
+                    if (null != list && list.size() > 0) {
+                        item.setBarrelCode(list.get(0).getBarrelCode());
+                    }
+
+                });
+            }
             System.out.println("支付成功，配方是" + JSON.toJSONString(formulaList));
             resultMap.put("productConfig", formulaList);
             resultMap.put("order", localOrder);
-            resultMap.put("member",member.getMemberName());
+            resultMap.put("member", member.getMemberName());
         } else if (wxStatus.equals("REFUND")) {
 //转入退款
             newStatus = "5";

imcs-bt-be/imcs-tenant-biz/src/main/java/com/github/zuihou/tenant/util/HttpClientUtils.java

@@ -1,6 +1,7 @@
 package com.github.zuihou.tenant.util;
 
 import cn.hutool.json.JSONObject;
+import com.alibaba.fastjson.JSON;
 import org.apache.http.HttpEntity;
 import org.apache.http.HttpResponse;
 import org.apache.http.HttpStatus;
@@ -26,11 +27,15 @@ import org.apache.http.impl.conn.ManagedHttpClientConnectionFactory;
 import org.apache.http.impl.conn.PoolingHttpClientConnectionManager;
 import org.apache.http.impl.conn.SystemDefaultDnsResolver;
 import org.apache.http.impl.io.DefaultHttpRequestWriterFactory;
+import org.apache.http.protocol.HTTP;
 import org.apache.http.util.EntityUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
+import sun.misc.BASE64Encoder;
 
+import java.io.ByteArrayOutputStream;
 import java.io.IOException;
+import java.io.InputStream;
 import java.net.SocketTimeoutException;
 import java.util.HashMap;
 import java.util.Map;
@@ -288,6 +293,42 @@ public class HttpClientUtils {
     }
 
 
+
+
+    public String   test(String token,Map<String,Object> params1) throws IOException {
+        CloseableHttpClient  httpClient = HttpClientBuilder.create().build();
+
+        HttpPost httpPost = new HttpPost("https://api.weixin.qq.com/wxa/getwxacodeunlimit?access_token="+token);  // 接口
+        httpPost.addHeader(HTTP.CONTENT_TYPE, "application/json");
+        String body = JSON.toJSONString(params1);
+        System.err.println(body);//必须是json模式的 post
+        StringEntity entity;
+        entity = new StringEntity(body);
+        entity.setContentType("image/png");
+
+        httpPost.setEntity(entity);
+        HttpResponse response;
+
+        response = httpClient.execute(httpPost);
+        InputStream inputStream = response.getEntity().getContent();
+        ByteArrayOutputStream bytestream = new ByteArrayOutputStream();
+        int ch;
+        try {
+            while ((ch = inputStream.read()) != -1) {
+                bytestream.write(ch);
+            }
+        }
+        catch (IOException e) {
+            // TODO Auto-generated catch block
+            e.printStackTrace();
+        }
+        byte[] program = bytestream.toByteArray();
+        BASE64Encoder encoder = new BASE64Encoder();
+        String  binary = encoder.encodeBuffer(program).trim();
+        return binary;
+    }
+
+
     /**
      * 获取数据流
      *