From acbf0a6e954a523bb4fd0d8e5c47e081b231af0b Mon Sep 17 00:00:00 2001
From: clunt <clunt@vip.163.com>
Date: Thu, 26 May 2022 15:08:52 +0800
Subject: [PATCH] fix

---
 .../com/ghy/common/adapay/AdapayService.java     | 16 ++++++++--------
 .../main/resources/mapper/goods/GoodsMapper.xml  |  6 +++---
 .../java/com/ghy/message/config/JimConfig.java   |  4 ++--
 .../resources/mapper/order/OrderGoodsMapper.xml  |  2 +-
 .../resources/mapper/order/OrderMasterMapper.xml |  3 ++-
 pom.xml                                          | 12 ++++++------
 6 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/ghy-common/src/main/java/com/ghy/common/adapay/AdapayService.java b/ghy-common/src/main/java/com/ghy/common/adapay/AdapayService.java
index 4f51bdcc..b3f27361 100644
--- a/ghy-common/src/main/java/com/ghy/common/adapay/AdapayService.java
+++ b/ghy-common/src/main/java/com/ghy/common/adapay/AdapayService.java
@@ -189,21 +189,21 @@ public class AdapayService {
                                             String email, String gender, String nickname) throws BaseAdaPayException {
         // 获取商户的appId
         String appId = AdapayConfig.getAppId(deptId);
-        Map<String, Object> memberParams = new HashMap<>(7);
+        Map<String, Object> memberParams = new HashMap<>();
         memberParams.put("member_id", memberId);
         memberParams.put("app_id", appId);
-        memberParams.put("location", location);
-        memberParams.put("email", email);
-        memberParams.put("gender", gender);
-        memberParams.put("nickname", nickname);
+//        memberParams.put("location", location);
+//        memberParams.put("email", email);
+//        memberParams.put("gender", gender);
+//        memberParams.put("nickname", nickname);
         memberParams.put("tel_no", telNo);
         memberParams.put("user_name", username);
         // 证件类型，仅支持：00-身份证
         memberParams.put("cert_type", "00");
         // 接口功能号
-        memberParams.put("adapay_func_code", "members.realname");
+        memberParams.put("adapay_func_code", deptId.toString());
         memberParams.put("cert_id", certId);
-        return AdapayCommon.requestAdapay(memberParams);
+        return AdapayCommon.requestAdapay(memberParams, deptId.toString());
     }
 
     /**
@@ -294,7 +294,7 @@ public class AdapayService {
         paymentParams.put("expend", expend);
         PayReplyMapping.putCallback(payParam.getOrderNo(), callback);
         logger.debug("paymentParams: {}", paymentParams.toJSONString());
-        return Payment.create(paymentParams);
+        return Payment.create(paymentParams, String.valueOf(deptId));
     }
 
     /**
diff --git a/ghy-goods/src/main/resources/mapper/goods/GoodsMapper.xml b/ghy-goods/src/main/resources/mapper/goods/GoodsMapper.xml
index 108060ad..d10c7792 100644
--- a/ghy-goods/src/main/resources/mapper/goods/GoodsMapper.xml
+++ b/ghy-goods/src/main/resources/mapper/goods/GoodsMapper.xml
@@ -140,9 +140,9 @@
 
     <select id="selectByIds" resultMap="GoodsResult">
         <include refid="selectGoods"/>
-         goods_id IN
-        <foreach collection="array" item="ids" open="(" separator="," close=")">
-            #{goodsId}
+        where goods_id IN
+        <foreach collection="collection" item="ids" open="(" separator="," close=")">
+            #{ids}
         </foreach>
     </select>
 </mapper>
\ No newline at end of file
diff --git a/ghy-message/src/main/java/com/ghy/message/config/JimConfig.java b/ghy-message/src/main/java/com/ghy/message/config/JimConfig.java
index 034fd78e..fcac9b07 100644
--- a/ghy-message/src/main/java/com/ghy/message/config/JimConfig.java
+++ b/ghy-message/src/main/java/com/ghy/message/config/JimConfig.java
@@ -10,8 +10,8 @@ import org.springframework.context.annotation.Configuration;
  * @author clunt
  * 极光消息配置文件
  */
-@Configuration
-@ConfigurationProperties(prefix = "jim")
+//@Configuration
+//@ConfigurationProperties(prefix = "jim")
 @Data
 public class JimConfig {
 
diff --git a/ghy-order/src/main/resources/mapper/order/OrderGoodsMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderGoodsMapper.xml
index 1e02b650..a6800345 100644
--- a/ghy-order/src/main/resources/mapper/order/OrderGoodsMapper.xml
+++ b/ghy-order/src/main/resources/mapper/order/OrderGoodsMapper.xml
@@ -41,7 +41,7 @@
     </update>
 
     <insert id="insertOrderGoods" parameterType="com.ghy.order.domain.OrderGoods" useGeneratedKeys="true"
-            keyProperty="id">
+            keyProperty="orderGoodsId">
         INSERT INTO order_goods(
             <if test="orderId != null and orderId != 0">order_id,</if>
             <if test="goodsId != null and goodsId != 0">goods_id,</if>
diff --git a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
index 55c34d69..aae7a635 100644
--- a/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
+++ b/ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
@@ -140,7 +140,8 @@
         WHERE `code` =#{orderMasterCode} LIMIT 1
     </select>
 
-    <select id="selectByCode" parameterType="String" resultType="com.ghy.order.domain.OrderMaster">
+    <select id="selectByCode" parameterType="String" resultMap="OrderMasterResult
+">
         <include refid="selectOrderMaster"/>
         WHERE `code` = #{orderMasterCode}
     </select>
diff --git a/pom.xml b/pom.xml
index fd054676..3ba85311 100644
--- a/pom.xml
+++ b/pom.xml
@@ -311,11 +311,11 @@
             </dependency>
 
             <!-- 聊天工具-->
-            <dependency>
-                <groupId>com.ghy</groupId>
-                <artifactId>ghy-message</artifactId>
-                <version>${ghy.version}</version>
-            </dependency>
+<!--            <dependency>-->
+<!--                <groupId>com.ghy</groupId>-->
+<!--                <artifactId>ghy-message</artifactId>-->
+<!--                <version>${ghy.version}</version>-->
+<!--            </dependency>-->
 
             <!-- 通用工具-->
             <dependency>
@@ -345,7 +345,7 @@
         <module>ghy-common</module>
         <module>ghy-custom</module>
         <module>ghy-worker</module>
-        <module>ghy-message</module>
+<!--        <module>ghy-message</module>-->
     </modules>
     <packaging>pom</packaging>