clunt
/
ghy-all
1
0
Fork 0
Code Issues Pull Requests 1 Packages Projects Releases Wiki Activity

fix

This commit is contained in:
clunt 2022-05-26 15:08:52 +08:00
parent 0aefc0cb95
commit acbf0a6e95
6 changed files with 22 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ghy-common/src/main/java/com/ghy/common/adapay/AdapayService.java
View File

@ -189,21 +189,21 @@ public class AdapayService {
String email, String gender, String nickname) throws BaseAdaPayException { String email, String gender, String nickname) throws BaseAdaPayException {
// 获取商户的appId // 获取商户的appId
String appId = AdapayConfig.getAppId(deptId); 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("member_id", memberId);
memberParams.put("app_id", appId); memberParams.put("app_id", appId);
memberParams.put("location", location); // memberParams.put("location", location);
memberParams.put("email", email); // memberParams.put("email", email);
memberParams.put("gender", gender); // memberParams.put("gender", gender);
memberParams.put("nickname", nickname); // memberParams.put("nickname", nickname);
memberParams.put("tel_no", telNo); memberParams.put("tel_no", telNo);
memberParams.put("user_name", username); memberParams.put("user_name", username);
// 证件类型，仅支持：00-身份证 // 证件类型，仅支持：00-身份证
memberParams.put("cert_type", "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); 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); paymentParams.put("expend", expend);
PayReplyMapping.putCallback(payParam.getOrderNo(), callback); PayReplyMapping.putCallback(payParam.getOrderNo(), callback);
logger.debug("paymentParams: {}", paymentParams.toJSONString()); logger.debug("paymentParams: {}", paymentParams.toJSONString());
return Payment.create(paymentParams); return Payment.create(paymentParams, String.valueOf(deptId));
} }
/** /**

6
ghy-goods/src/main/resources/mapper/goods/GoodsMapper.xml
View File

@ -140,9 +140,9 @@
<select id="selectByIds" resultMap="GoodsResult"> <select id="selectByIds" resultMap="GoodsResult">
<include refid="selectGoods"/> <include refid="selectGoods"/>
goods_id IN where goods_id IN
<foreach collection="array" item="ids" open="(" separator="," close=")"> <foreach collection="collection" item="ids" open="(" separator="," close=")">
#{goodsId} #{ids}
</foreach> </foreach>
</select> </select>
</mapper> </mapper>

4
ghy-message/src/main/java/com/ghy/message/config/JimConfig.java
View File

@ -10,8 +10,8 @@ import org.springframework.context.annotation.Configuration;
* @author clunt * @author clunt
* 极光消息配置文件 * 极光消息配置文件
*/ */
@Configuration //@Configuration
@ConfigurationProperties(prefix = "jim") //@ConfigurationProperties(prefix = "jim")
@Data @Data
public class JimConfig { public class JimConfig {

2
ghy-order/src/main/resources/mapper/order/OrderGoodsMapper.xml
View File

@ -41,7 +41,7 @@
</update> </update>
<insert id="insertOrderGoods" parameterType="com.ghy.order.domain.OrderGoods" useGeneratedKeys="true" <insert id="insertOrderGoods" parameterType="com.ghy.order.domain.OrderGoods" useGeneratedKeys="true"
keyProperty="id"> keyProperty="orderGoodsId">
INSERT INTO order_goods( INSERT INTO order_goods(
<if test="orderId != null and orderId != 0">order_id,</if> <if test="orderId != null and orderId != 0">order_id,</if>
<if test="goodsId != null and goodsId != 0">goods_id,</if> <if test="goodsId != null and goodsId != 0">goods_id,</if>

3
ghy-order/src/main/resources/mapper/order/OrderMasterMapper.xml
View File

@ -140,7 +140,8 @@
WHERE `code` =#{orderMasterCode} LIMIT 1 WHERE `code` =#{orderMasterCode} LIMIT 1
</select> </select>
<select id="selectByCode" parameterType="String" resultType="com.ghy.order.domain.OrderMaster"> <select id="selectByCode" parameterType="String" resultMap="OrderMasterResult
">
<include refid="selectOrderMaster"/> <include refid="selectOrderMaster"/>
WHERE `code` = #{orderMasterCode} WHERE `code` = #{orderMasterCode}
</select> </select>

12
pom.xml
View File

@ -311,11 +311,11 @@
</dependency> </dependency>
<!-- 聊天工具--> <!-- 聊天工具-->
<dependency> <!-- <dependency>-->
<groupId>com.ghy</groupId> <!-- <groupId>com.ghy</groupId>-->
<artifactId>ghy-message</artifactId> <!-- <artifactId>ghy-message</artifactId>-->
<version>${ghy.version}</version> <!-- <version>${ghy.version}</version>-->
</dependency> <!-- </dependency>-->
<!-- 通用工具--> <!-- 通用工具-->
<dependency> <dependency>
@ -345,7 +345,7 @@
<module>ghy-common</module> <module>ghy-common</module>
<module>ghy-custom</module> <module>ghy-custom</module>
<module>ghy-worker</module> <module>ghy-worker</module>
<module>ghy-message</module> <!-- <module>ghy-message</module>-->
</modules> </modules>
<packaging>pom</packaging> <packaging>pom</packaging>