发货单

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/MobileLoginParamDto.java

@@ -54,5 +54,6 @@ public class MobileLoginParamDto {
     @ApiModelProperty("注册类型为2-手机验证登录时使用：验证码")
     private String verifyCode;
 
+    @ApiModelProperty("农户信息")
     private PeasantHouseholdDto peasantHouseholdDto;
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/PeasantHouseholdDto.java

@@ -105,13 +105,13 @@ public class PeasantHouseholdDto  extends BaseDto {
    private List<String> permanentAddressText;
 
     @ApiModelProperty(value = "区域公司id")
-    private String companyId;
+    private String regionalCompaniesSeq;
 
     @ApiModelProperty(value = "区域公司code")
-    private String companyCode;
+    private String regionalCompaniesCode;
 
     @ApiModelProperty(value = "区域公司名称")
-    private String companyName;
+    private String regionalCompaniesName;
 
     @ApiModelProperty(value = "身份证正面")
     @TableField(typeHandler = FastjsonTypeHandler.class)
@@ -126,10 +126,4 @@ public class PeasantHouseholdDto  extends BaseDto {
 
     @ApiModelProperty(value = "是否已认证（0-未认证，1-已认证）")
     private Integer isCertified;
-
-    @ApiModelProperty(value = "微信注册账号")
-    private String loginId;
-
-    @ApiModelProperty(value = "微信注册密码")
-    private String loginPassword;
 }

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/dto/PeasantHouseholdWxDto.java

@@ -19,15 +19,9 @@ import java.util.List;
  * @date 2023/8/21 13:16
  */
 @Data
-@ApiModel (value="PeasantHouseholdWxDto", description="农户信息")
+@ApiModel (value="PeasantHouseholdWxDto", description="微信农户登录信息")
 public class PeasantHouseholdWxDto {
 
-    @ApiModelProperty (value = "登录方式")
-    private String loginType;
-
-    @ApiModelProperty (value = "验证码登录code")
-    private String verifyCode;
-
     @ApiModelProperty
     private String userState;
 

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/entity/PeasantHousehold.java

@@ -143,18 +143,18 @@ public class PeasantHousehold extends BaseEntity {
     /*
      * 区域公司id
      * */
-    @TableField("company_id")
-    private String companyId;
+    @TableField("regional_companies_seq")
+    private String regionalCompaniesSeq;
     /*
      * 区域公司code
      * */
-    @TableField("company_code")
-    private String companyCode;
+    @TableField("regional_companies_code")
+    private String regionalCompaniesCode;
     /*
      * 区域公司名称
      * */
-    @TableField("company_name")
-    private String companyName;
+    @TableField("regional_companies_name")
+    private String regionalCompaniesName;
     /*
      * 身份证正面
      * */
@@ -175,15 +175,5 @@ public class PeasantHousehold extends BaseEntity {
      * */
     @TableField("is_certified")
     private Integer isCertified;
-    /*
-     * 微信注册账号
-     * */
-    @TableField("login_id")
-    private String loginId;
-    /*
-     * 微信注册密码
-     * */
-    @TableField("login_password")
-    private String loginPassword;
 
 }

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/java/com/yeejoin/amos/boot/module/hygf/biz/service/impl/WxServiceImpl.java

@@ -13,7 +13,7 @@ import org.typroject.tyboot.core.restful.exception.instance.BadRequest;
 import java.io.InputStream;
 
 /**
- * TODO(一句话描述该类的功能)
+ * 农户微信小程序
  *
  * @author Provence
  * @version v1.0
@@ -41,22 +41,13 @@ public class WxServiceImpl {
     public JSONObject getCode2Session(String code) {
         String url = buildOpenIdUrl(appId, secret, code);
         String resultStr = HttpUtil.sendHttpGet(url);
-        ResponeVo responeVo = JSONObject.parseObject(resultStr, ResponeVo.class);
-        log.error("手机号解析结果" + JSONObject.toJSONString(responeVo));
-        System.out.println("手机号解析结果" + JSONObject.toJSONString(responeVo));
-        JSONObject jsonObject = JSONObject.parseObject(responeVo.getContent());
-        if (jsonObject != null) {
-            int errcode = jsonObject.getIntValue("errcode");
-            if (errcode == 0) {
-                // session_key 会话秘钥
-                // String openId = jsonObject.getString("openid");
-                return jsonObject;
-            } else {
-                throw new BadRequest(jsonObject.getString("errmsg"));
-            }
-        } else {
-            throw new BadRequest("微信接口调用失败");
+        // resultStr => {"session_key":"Mj5xbDhcZU73DtUduI1xKg==","openid":"oRraY5aYJkxkDJiG4rBaaw4MSmPA"}
+        log.info("微信 Code2Session, code =>{}, 结果 => {}", code, resultStr);
+        JSONObject jsonObject = JSONObject.parseObject(resultStr);
+        if (jsonObject == null || jsonObject.getIntValue("errcode") != 0) {
+            throw new BadRequest(jsonObject.getString("errmsg"));
         }
+        return jsonObject;
     }
 
     private String buildOpenIdUrl(String appId, String secret, String code) {
@@ -73,4 +64,13 @@ public class WxServiceImpl {
         byte[] inStream;
         InputStream inputStream;
     }
+
+    public String getOpenId(String code) {
+        JSONObject jsonObject = getCode2Session(code);
+        String openId = null;
+        if (jsonObject != null) {
+            openId = jsonObject.getString("openid");
+        }
+        return openId;
+    }
 }

amos-boot-system-jxiop/amos-boot-module-hygf-biz/src/main/resources/application-dev.properties

@@ -112,9 +112,15 @@ hygf.user.group.id=1679755750924120066
 unitInfo.station.examine.planId=51776087-a9cf-4a87-9a03-24fd24a8cf45
 
 hygf.sms.tempCodeJXS=SMS_HYGF_0002
+# ============================================= v20230821 add properties =============================================
+security.productWeb=AMOS_STUDIO_WEB
+security.appKey=AMOS_STUDIO
 
-login.environment=
-security.productWeb=
-security.appKey=
+login.environment=dev
+# 光伏农户微信小程序信息
 hygfProgram.appid=wx2188769349b1ddeb
-hygfProgram.secret=
+hygfProgram.secret=3bfd098cfdac002126e728d2dbf83c0d
\ No newline at end of file
+# 默认微信小程序农户经销商
+farmer.orgCode=86
+farmer.sequenceNbr=1620981815542046722
+farmer.orgNamesWithoutRole=智信能源科技有限公司
\ No newline at end of file