Merge branch 'local/share_1008' into develop-new

cooleshow-app/src/main/java/com/yonge/cooleshow/admin/controller/open/UserPaymentClient.java

@@ -172,10 +172,11 @@ public class UserPaymentClient {
             }
 
             JSONObject dataObj = JSON.parseObject(data);
+            log.info("adapay callback data:{}", dataObj.toJSONString());
 
             String memberId = dataObj.getString("member_id");
 
-            TenantMember tenantMember = tenantMemberService.getByMemberId(memberId, EPayerType.YEEPAY);
+            TenantMember tenantMember = tenantMemberService.getByMemberId(memberId, EPayerType.ADAPAY);
             if(tenantMember == null){
                 return "账户["+ memberId +"]在系统中不存在";
             }

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/TenantAlbumServiceImpl.java

@@ -331,6 +331,7 @@ public class TenantAlbumServiceImpl extends ServiceImpl<TenantAlbumMapper, Tenan
                         .tenantId(tenantAlbumPurchase.getTenantId())
                         .transAmount(userOrderDetailVo.getActualPrice())
                         .inOrOut(InOrOutEnum.OUT.getCode())
+                        .sourceType(SourceTypeEnum.ORDER)
                         .postStatus(PostStatusEnum.RECORDED.getCode())
                         .bizType(OrderTypeEnum.TENANT_ALBUM.getCode())
                         .bizId(userOrderDetailVo.getBizId())