'1'

zzjs-admin/src/main/java/com/miaxis/app/controller/fulu/FuluController.java

@@ -0,0 +1,85 @@
+package com.miaxis.app.controller.fulu;
+
+import com.alibaba.fastjson.JSONObject;
+import com.miaxis.common.constant.Constants;
+import com.miaxis.common.core.controller.BaseController;
+import com.miaxis.common.core.domain.Response;
+import com.miaxis.common.exception.CustomException;
+import com.miaxis.common.sms.MD5Utils;
+import com.miaxis.feign.dto.FilmDTO;
+import com.miaxis.feign.dto.fulu.FuluCommonApiDTO;
+import com.miaxis.feign.dto.fulu.FuluDTO;
+import com.miaxis.feign.service.IFuluService;
+import com.miaxis.wx.service.IWxOrderService;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.io.IOException;
+import java.text.SimpleDateFormat;
+import java.util.Arrays;
+import java.util.Date;
+
+import static com.miaxis.common.constant.Constants.FILM_BLACK_LIST;
+
+/**
+ * 【小程序-客户信息】Controller
+ *
+ */
+@RestController
+@RequiredArgsConstructor
+@RequestMapping(Constants.STUDENT_PREFIX+"/fulu")
+@Api(tags = {"【小程序-福禄】"})
+@Slf4j
+public class FuluController extends BaseController {
+
+
+    @Autowired
+    private IFuluService fuluService;
+
+    @Value("${fulu.appKey}")
+    private String appKey;
+    @Value("${fulu.appSecret}")
+    private String appSecret;
+
+    @PostMapping(value = "/fuluCommonApi")
+    @ApiOperation("福禄通用接口")
+    public  Response<JSONObject>  httpPostWithForm(@RequestBody FuluCommonApiDTO fuluCommonApiDTO) {
+
+
+        FuluDTO fuluDTO = new FuluDTO();
+        init(fuluDTO,fuluCommonApiDTO);
+
+        // 用于接收返回的结果
+        String resultData = fuluService.fuluCommonApi(fuluDTO);
+        return Response.success(JSONObject.parseObject(resultData));
+    }
+
+    private void init(FuluDTO fuluDTO, FuluCommonApiDTO fuluCommonApiDTO) {
+        fuluDTO.setApp_key(appKey);
+        fuluDTO.setMethod(fuluCommonApiDTO.getMethod());
+        SimpleDateFormat simpleDateFormat = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+        fuluDTO.setTimestamp(simpleDateFormat.format(new Date()));
+        fuluDTO.setVersion("2.0");
+        fuluDTO.setFormat("json");
+        fuluDTO.setCharset("utf-8");
+        fuluDTO.setSign_type("md5");
+        fuluDTO.setApp_auth_token("");
+        fuluDTO.setBiz_content(fuluCommonApiDTO.getBiz_content());
+        String str = JSONObject.toJSONString(fuluDTO);
+        char[] s = str.toCharArray();
+        Arrays.sort(s);
+        String outputSignOriginalStr = new String(s) + appSecret;
+        String sign = MD5Utils.MD5Encode(outputSignOriginalStr);
+        fuluDTO.setSign(sign);
+    }
+
+
+}

zzjs-admin/src/main/java/com/miaxis/app/controller/wx/WxController.java

@@ -183,7 +183,7 @@ public class WxController extends BaseController {
             @PathVariable("outTradeNo") String outTradeNo
     ){
         WxOrder wxOrder = wxOrderService.getByOutTradeNo(outTradeNo);
-        if (!wxOrder.getOpenid().equals(SecurityUtils.getLoginUser().getStudent().getOpenid())&& !wxOrder.getOpenid().equals("oO7PJ5FlradAM7tqw3TM2zvEj4O4")){
+        if (!wxOrder.getOpenid().equals(SecurityUtils.getLoginUser().getStudent().getOpenid())){
             throw new CustomException("该用户无访问此订单权限");
         }
         return Response.success(wxOrder);

zzjs-admin/src/main/resources/application-dev.yml

@@ -143,5 +143,5 @@ wai:
 
 # 福禄平台
 fulu:
-    appKey: "7629"
-    appSecret: "cce08fcab10ff96a863892bb6e396a9e"
+    appKey: "i4esv1l+76l/7NQCL3QudG90Fq+YgVfFGJAWgT+7qO1Bm9o/adG/1iwO2qXsAXNB"
+    appSecret: "0a091b3aa4324435aab703142518a8f7"

zzjs-admin/src/main/resources/application-prod.yml

@@ -139,3 +139,9 @@ mei:
 wai:
     appid: "7629"
     secret: "cce08fcab10ff96a863892bb6e396a9e"
+
+
+# 福禄平台
+fulu:
+    appKey: "i4esv1l+76l/7NQCL3QudG90Fq+YgVfFGJAWgT+7qO1Bm9o/adG/1iwO2qXsAXNB"
+    appSecret: "0a091b3aa4324435aab703142518a8f7"

zzjs-service/src/main/java/com/miaxis/feign/dto/fulu/FuluCommonApiDTO.java

@@ -0,0 +1,18 @@
+package com.miaxis.feign.dto.fulu;
+
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+/**
+ * 福禄传输对象
+ */
+@Data
+public class FuluCommonApiDTO {
+    @ApiModelProperty(value = "接口方法名称",required = true)
+    String method;
+    @ApiModelProperty(value= "请求参数集合,该参数是以json字符串的形式传输",required = true)
+    String biz_content;
+}

zzjs-service/src/main/resources/mapper/wx/WxOrderMapper.xml

@@ -80,7 +80,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectOrderList" resultType="com.miaxis.wx.domain.WxOrder">
         select * from wx_order
-         where openid=#{openid} and trade_state ='SUCCESS'
+         where  trade_state ='SUCCESS'
         <if test="days != null  and days != ''">
             and  DATE_SUB(CURDATE(), INTERVAL #{days} DAY) &lt;= date(create_time)
         </if>