添加pay_log表，字段

jsjp-admin/src/main/java/com/miaxis/app/controller/wx/WxJsjpController.java

@@ -117,6 +117,8 @@ public class WxJsjpController extends BaseController {
         order.setSchool(gzptUserInfo.getSchool());
         order.setSchoolName(gzptUserInfo.getSchoolName());
         order.setIsShare(isShare);
+        order.setCreateId(gzptUserInfo.getOutCreateId());
+
         Double price = Double.parseDouble(values[0])*100;   //订单总额
         int b =  new Double(price).intValue();
         order.setTotal(b);

jsjp-service/src/main/java/com/miaxis/feign/dto/WxTegUser.java

@@ -0,0 +1,9 @@
+package com.miaxis.feign.dto;
+
+public class WxTegUser {
+
+
+    //公共参数
+    private String tagid;  //标签ID
+    private String next_openid; //第一个拉取的OPENID，不填默认从头开始拉取
+}

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

@@ -1,18 +0,0 @@
-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;
-}

jsjp-service/src/main/java/com/miaxis/feign/dto/fulu/FuluDTO.java

@@ -1,26 +0,0 @@
-package com.miaxis.feign.dto.fulu;
-
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-
-/**
- * 福禄传输对象
- */
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class FuluDTO {
-    String app_key;
-    String method;
-    String timestamp;
-    String version;
-    String format;
-    String charset;
-    String sign_type;
-    String sign;
-    String app_auth_token;
-    String biz_content;
-}

jsjp-service/src/main/java/com/miaxis/feign/dto/fulu/FuluGoodsInfo.java

@@ -1,23 +0,0 @@
-package com.miaxis.feign.dto.fulu;
-
-
-import lombok.Data;
-
-/**
- * Fulu商品
- */
-
-@Data
-public class FuluGoodsInfo {
-    int product_id;
-    String product_name;
-    double face_value;
-    String product_type;
-    double purchase_price;
-    String template_id;
-    String stock_status;
-    String sales_status;
-    String details;
-    String four_category_icon;
-
-}

jsjp-service/src/main/java/com/miaxis/feign/dto/fulu/FuluResult.java

@@ -1,20 +0,0 @@
-package com.miaxis.feign.dto.fulu;
-
-
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-
-/**
- * 福禄传输对象
- */
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class FuluResult {
-    Integer code;
-    String message;
-    String result;
-    String sign;
-
-}

jsjp-service/src/main/java/com/miaxis/feign/service/IWxSendService.java

@@ -3,6 +3,7 @@ package com.miaxis.feign.service;
 import com.miaxis.common.config.FeignConfig;
 import com.miaxis.feign.dto.WxGzhSend;
 import com.miaxis.feign.dto.WxSend;
+import com.miaxis.feign.dto.WxTegUser;
 import org.springframework.cloud.openfeign.FeignClient;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -27,14 +28,49 @@ public interface IWxSendService {
                           @RequestParam("appid") String appid,
                           @RequestParam("secret") String secret);
 
+    /**
+     * 用户管理 /获取用户列表
+     * 公众号可通过本接口来获取帐号的关注者列表，关注者列表由一串OpenID（加密后的微信号，每个用户对每个公众号的OpenID是唯一的）组成。
+     * 一次拉取调用最多拉取10000个关注者的OpenID，可以通过多次拉取的方式来满足需求。
+     * @param access_token
+     * @param next_openid
+     * @return
+     */
     @GetMapping(value = "/user/get")
     String getUser(@RequestParam("access_token") String access_token,
                           @RequestParam("next_openid") String next_openid);
 
+    /**
+     * 获取用户基本信息(UnionID机制)
+     * 在关注者与公众号产生消息交互后，公众号可获得关注者的OpenID（加密后的微信号，每个用户对每个公众号的OpenID是唯一的。对于不同公众号，同一用户的openid不同）。
+     * 公众号可通过本接口来根据OpenID获取用户基本信息，包括语言和关注时间。
+     * 请注意，如果开发者有在多个公众号，或在公众号、移动应用之间统一用户帐号的需求，需要前往微信开放平台（open.weixin.qq.com）绑定公众号后，才可利用UnionID机制来满足上述需求。
+     * @param access_token
+     * @param openid
+     * @param lang
+     * @return
+     */
+
     @GetMapping(value = "/user/info")
     String getUserInfo(@RequestParam("access_token") String access_token,
                    @RequestParam("openid") String openid,
                    @RequestParam("lang") String lang);
 
 
+    /**
+     * 获取公众号已创建的标签
+     * @param access_token
+     * @return
+     */
+    @PostMapping(value = "/tags/get")
+    String getTag(@RequestParam("access_token") String access_token);
+
+    /**
+     * 获取标签下粉丝列表
+     * @param access_token
+     * @return
+     */
+    @PostMapping(value = "/user/tag/get")
+    String getTagUser(@RequestParam("access_token") String access_token, WxTegUser tegUser);
+
 }

jsjp-service/src/main/java/com/miaxis/newgzpt/domain/GzptSchPayLog.java

@@ -73,4 +73,12 @@ public class GzptSchPayLog implements Serializable {
     @TableField("OUT_TRADE_NO")
     private String outTradeNo;
 
+    @ApiModelProperty(value = "创建人ID")
+    @TableField("CREATE_ID")
+    private Long createId;
+
+    @ApiModelProperty(value = "创建人ID")
+    @TableField("SCHOOL_COMMISSION")
+    private Integer schoolCommission;
+
 }

jsjp-service/src/main/java/com/miaxis/newgzpt/domain/GzptUserInfo.java

@@ -154,4 +154,8 @@ public class GzptUserInfo implements Serializable {
     @TableField("IS_SHARE")
     private Integer isShare;
 
+    @ApiModelProperty(value = "创建人ID")
+    @TableField("OUT_CREATE_ID")
+    private Long outCreateId;
+
 }

jsjp-service/src/main/java/com/miaxis/order/domain/OrderInfo.java

@@ -138,5 +138,11 @@ public class OrderInfo extends BaseBusinessEntity{
     @ApiModelProperty(value = "退款原因")
     private String refundReason;
 
+    /** 该用户创建人ID */
+    @Excel(name = "该用户创建人ID")
+    @TableField("create_id")
+    @ApiModelProperty(value = "该用户创建人ID")
+    private Long createId;
+
 
 }

jsjp-service/src/main/java/com/miaxis/order/service/impl/OrderInfoServiceImpl.java

@@ -91,7 +91,7 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
         orderInfo.setSchoolCommission(order.getSchoolCommission());
         orderInfo.setPhoneType(order.getPhoneType());
         orderInfo.setIsShare(order.getIsShare());
-
+        orderInfo.setCreateId(order.getCreateId());
 
         GzptUserInfo userInfo = userInfoService.getInfoById(order.getUserId());
         int isActiva = schActivationService.isSchActivation(order.getUserId());
@@ -1769,6 +1769,8 @@ public class OrderInfoServiceImpl extends ServiceImpl<OrderInfoMapper, OrderInfo
         schPayLog.setState(state); // 1充值  2退款
         schPayLog.setGoodsName(order.getGoodsName());
         schPayLog.setOutTradeNo(order.getOutTradeNo());
+        schPayLog.setCreateId(order.getCreateId());
+        schPayLog.setSchoolCommission(order.getSchoolCommission());
         schPayLogService.saveSchPayLog(schPayLog);
     }
 

jsjp-service/src/main/java/com/miaxis/wx/domain/WxJsOrder.java

@@ -20,7 +20,7 @@ import java.util.Date;
  */
 @Data
 @TableName("wx_js_order")
-@ApiModel(value = "WxOrder", description = "微信订单对象 wx_order")
+@ApiModel(value = "WxJsOrder", description = "微信订单对象 wx_js_order")
 public class WxJsOrder extends BaseBusinessEntity{
     private static final long serialVersionUID = 1L;
 
@@ -196,4 +196,10 @@ public class WxJsOrder extends BaseBusinessEntity{
     @ApiModelProperty(value = "手机类型 1:苹果 2:安卓")
     private Integer phoneType;
 
+    /** 该用户创建人ID */
+    @Excel(name = "该用户创建人ID")
+    @TableField("create_id")
+    @ApiModelProperty(value = "该用户创建人ID")
+    private Long createId;
+
 }

jsjp-service/src/main/resources/mapper/newgzpt/GzptSchPayLogMapper.xml

@@ -8,7 +8,7 @@
         <selectKey keyProperty="id" resultType="java.lang.Long" order="BEFORE">
             SELECT SEQ_GZPT_SCH_PAY_LOG.NEXTVAL FROM DUAL
         </selectKey>
-        insert into GZPT_SCH_PAY_LOG (ID, STU_ID, DQBH, PRICE, JXBH, CRTIME, SYNC, SYNCTIME, STATE, GOODS_NAME, OUT_TRADE_NO) VALUES (#{id,jdbcType=NUMERIC},
+        insert into GZPT_SCH_PAY_LOG (ID, STU_ID, DQBH, PRICE, JXBH, CRTIME, SYNC, SYNCTIME, STATE, GOODS_NAME, OUT_TRADE_NO, CREATE_ID, SCHOOL_COMMISSION) VALUES (#{id,jdbcType=NUMERIC},
                                                  #{stuId,jdbcType=NUMERIC},
                                                  #{dqbh,jdbcType=VARCHAR},
                                                  #{price,jdbcType=NUMERIC},
@@ -18,7 +18,9 @@
                                                  null,
                                                  #{state,jdbcType=NUMERIC},
                                                  #{goodsName,jdbcType=VARCHAR},
-                                                 #{outTradeNo,jdbcType=VARCHAR})
+                                                 #{outTradeNo,jdbcType=VARCHAR},
+                                                 #{createId,jdbcType=NUMERIC},
+                                                 #{schoolCommission,jdbcType=NUMERIC})
     </insert>