From 7a51155cbbf59d30d3863e82f2c1b45735b045b1 Mon Sep 17 00:00:00 2001 From: lzx_win <2602107437@qq.com> Date: Thu, 7 Nov 2024 17:54:20 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/org/jeecg/modules/pay/MpWxPayService.java | 43 +++++++ .../controller/AtActorCollectionController.java | 2 +- .../entity/AtActorCollection.java | 6 +- .../mapper/AtActorCollectionMapper.java | 2 +- .../service/IAtActorCollectionService.java | 2 +- .../service/impl/AtActorCollectionServiceImpl.java | 2 +- .../vue/AtActorCollectionList.vue | 6 + .../vue/modules/AtActorCollectionForm.vue | 5 + .../vue3/AtActorCollection.data.ts | 10 ++ .../controller/HanHaiBannerController.java | 2 +- .../modules/hanHaiBanner/entity/HanHaiBanner.java | 31 ++--- .../hanHaiBanner/mapper/HanHaiBannerMapper.java | 2 +- .../hanHaiBanner/service/IHanHaiBannerService.java | 2 +- .../service/impl/HanHaiBannerServiceImpl.java | 2 +- .../modules/hanHaiBanner/vue/HanHaiBannerList.vue | 26 +++-- .../hanHaiBanner/vue/modules/HanHaiBannerForm.vue | 15 ++- .../modules/hanHaiBanner/vue3/HanHaiBanner.data.ts | 38 ++++-- .../controller/HanHaiRealEnterpriseController.java | 2 +- .../entity/HanHaiRealEnterprise.java | 14 ++- .../mapper/HanHaiRealEnterpriseMapper.java | 2 +- .../service/IHanHaiRealEnterpriseService.java | 2 +- .../impl/HanHaiRealEnterpriseServiceImpl.java | 2 +- .../vue/HanHaiRealEnterpriseList.vue | 20 ++++ .../vue/modules/HanHaiRealEnterpriseForm.vue | 15 +++ .../vue3/HanHaiRealEnterprise.data.ts | 35 ++++++ .../controller/HanHaiRealNameController.java | 2 +- .../hanHaiRealName/entity/HanHaiRealName.java | 17 ++- .../mapper/HanHaiRealNameMapper.java | 2 +- .../service/IHanHaiRealNameService.java | 2 +- .../service/impl/HanHaiRealNameServiceImpl.java | 2 +- .../hanHaiRealName/vue/HanHaiRealNameList.vue | 24 +++- .../vue/modules/HanHaiRealNameForm.vue | 17 ++- .../hanHaiRealName/vue3/HanHaiRealName.data.ts | 40 ++++++- .../noticeapicontroller/OrderApiController.java | 7 ++ .../jeecg/modules/apiservice/OrderApiService.java | 2 + .../apiservice/impl/IndexApiServiceImpl.java | 36 +++++- .../apiservice/impl/InfoApiServiceImpl.java | 127 +++++++++++++++------ .../apiservice/impl/OrderApiServiceImpl.java | 70 ++++++++++++ 38 files changed, 541 insertions(+), 95 deletions(-) diff --git a/han-hai-module-pay/src/main/java/org/jeecg/modules/pay/MpWxPayService.java b/han-hai-module-pay/src/main/java/org/jeecg/modules/pay/MpWxPayService.java index d4ac6a2..cbca894 100644 --- a/han-hai-module-pay/src/main/java/org/jeecg/modules/pay/MpWxPayService.java +++ b/han-hai-module-pay/src/main/java/org/jeecg/modules/pay/MpWxPayService.java @@ -159,6 +159,49 @@ public class MpWxPayService { + /** + * 微信吊起支付 + * @param productName + * @param clientIp + * @param productId + * @param price + * @param orderNo + * @param openId + * @param body + * @return + */ + public Object createOrder3(String productName, String clientIp, + String productId, Integer price, String orderNo, + String openId, String body){ + WxPayUnifiedOrderRequest request = new WxPayUnifiedOrderRequest(); + request.setDeviceInfo("WEB"); //设备号 + request.setTradeType("JSAPI"); //交易类型 + request.setBody(productName); //商品描述 + request.setOutTradeNo(orderNo); //商户订单号 + request.setDetail(productName); //商品详情 + request.setTotalFee(price); //总金额|分计 + request.setSpbillCreateIp(clientIp); //终端IP +// request.setNotifyUrl(wxPay.notifyUrl);//设置回调路径 + request.setNotifyUrl("https://admin.anqi.shop/a-notice-api/api/order/notify3");//设置回调路径 + request.setProductId(productId); //商品id + request.setOpenid(openId); //JSAPI OPENID + if (dev){ + request.setTotalFee(price); +// request.setNotifyUrl(wxPay.notifyUrlDev); + request.setNotifyUrl("https://admin.anqi.shop/a-notice-api/api/order/notify3");//设置回调路径 + } + try { + Object order = wxPayService.createOrder(request); + return order; + } catch (WxPayException e) { + e.printStackTrace(); + return e.getLocalizedMessage(); + } + } + + + + /** * 微信吊起支付 -- 加油小程序 diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/controller/AtActorCollectionController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/controller/AtActorCollectionController.java index 4a44687..f19f0b5 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/controller/AtActorCollectionController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/controller/AtActorCollectionController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 名片列表 * @Author: jeecg-boot - * @Date: 2024-10-30 + * @Date: 2024-11-05 * @Version: V1.0 */ @Api(tags="名片列表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/entity/AtActorCollection.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/entity/AtActorCollection.java index 12d4433..301d8ce 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/entity/AtActorCollection.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/entity/AtActorCollection.java @@ -20,7 +20,7 @@ import lombok.experimental.Accessors; /** * @Description: 名片列表 * @Author: jeecg-boot - * @Date: 2024-10-30 + * @Date: 2024-11-05 * @Version: V1.0 */ @Data @@ -126,4 +126,8 @@ public class AtActorCollection implements Serializable { @Excel(name = "点赞", width = 15) @ApiModelProperty(value = "点赞") private java.lang.Integer dropNum; + /**实名*/ + @Excel(name = "实名", width = 15) + @ApiModelProperty(value = "实名") + private java.lang.String idCardOpen; } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/mapper/AtActorCollectionMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/mapper/AtActorCollectionMapper.java index 0d01fae..f8de59f 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/mapper/AtActorCollectionMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/mapper/AtActorCollectionMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 名片列表 * @Author: jeecg-boot - * @Date: 2024-10-30 + * @Date: 2024-11-05 * @Version: V1.0 */ public interface AtActorCollectionMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/service/IAtActorCollectionService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/service/IAtActorCollectionService.java index 765fc13..b051c14 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/service/IAtActorCollectionService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/service/IAtActorCollectionService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 名片列表 * @Author: jeecg-boot - * @Date: 2024-10-30 + * @Date: 2024-11-05 * @Version: V1.0 */ public interface IAtActorCollectionService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/service/impl/AtActorCollectionServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/service/impl/AtActorCollectionServiceImpl.java index 1ee2d9e..b24df2c 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/service/impl/AtActorCollectionServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/service/impl/AtActorCollectionServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 名片列表 * @Author: jeecg-boot - * @Date: 2024-10-30 + * @Date: 2024-11-05 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/vue/AtActorCollectionList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/vue/AtActorCollectionList.vue index 5e8d036..ae90a62 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/vue/AtActorCollectionList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/vue/AtActorCollectionList.vue @@ -238,6 +238,11 @@ align:"center", dataIndex: 'dropNum' }, + { + title:'实名', + align:"center", + dataIndex: 'idCardOpen' + }, { title: '操作', dataIndex: 'action', @@ -293,6 +298,7 @@ fieldList.push({type:'sel_search',value:'topId',text:'置顶标识',dictTable:"at_top_price", dictText:'money', dictCode:'id'}) fieldList.push({type:'Text',value:'workName',text:'作品名称',dictCode:''}) fieldList.push({type:'int',value:'dropNum',text:'点赞',dictCode:''}) + fieldList.push({type:'string',value:'idCardOpen',text:'实名',dictCode:'user_state'}) this.superFieldList = fieldList } } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/vue/modules/AtActorCollectionForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/vue/modules/AtActorCollectionForm.vue index 1c714cf..52500c3 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/vue/modules/AtActorCollectionForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/vue/modules/AtActorCollectionForm.vue @@ -83,6 +83,11 @@ + + + + + diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/vue3/AtActorCollection.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/vue3/AtActorCollection.data.ts index b262ecd..cf338b2 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/vue3/AtActorCollection.data.ts +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/atActorCollection/vue3/AtActorCollection.data.ts @@ -101,6 +101,11 @@ export const columns: BasicColumn[] = [ align:"center", dataIndex: 'dropNum' }, + { + title: '实名', + align:"center", + dataIndex: 'idCardOpen' + }, ]; //查询数据 export const searchFormSchema: FormSchema[] = [ @@ -236,4 +241,9 @@ export const formSchema: FormSchema[] = [ field: 'dropNum', component: 'InputNumber', }, + { + label: '实名', + field: 'idCardOpen', + component: 'Input', + }, ]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiBanner/controller/HanHaiBannerController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiBanner/controller/HanHaiBannerController.java index d807e23..38d2c19 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiBanner/controller/HanHaiBannerController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiBanner/controller/HanHaiBannerController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 轮播广告 * @Author: jeecg-boot - * @Date: 2024-09-25 + * @Date: 2024-11-07 * @Version: V1.0 */ @Api(tags="轮播广告") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiBanner/entity/HanHaiBanner.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiBanner/entity/HanHaiBanner.java index 57bc152..dc354d0 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiBanner/entity/HanHaiBanner.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiBanner/entity/HanHaiBanner.java @@ -20,7 +20,7 @@ import lombok.experimental.Accessors; /** * @Description: 轮播广告 * @Author: jeecg-boot - * @Date: 2024-09-25 + * @Date: 2024-11-07 * @Version: V1.0 */ @Data @@ -51,6 +51,10 @@ public class HanHaiBanner implements Serializable { @DateTimeFormat(pattern="yyyy-MM-dd") @ApiModelProperty(value = "更新日期") private java.util.Date updateTime; + /**是否启用*/ + @Excel(name = "是否启用", width = 15) + @ApiModelProperty(value = "是否启用") + private java.lang.String isOpen; /**备注名称*/ @Excel(name = "备注名称", width = 15) @ApiModelProperty(value = "备注名称") @@ -63,23 +67,24 @@ public class HanHaiBanner implements Serializable { @Excel(name = "跳转地址", width = 15) @ApiModelProperty(value = "跳转地址") private java.lang.String toUrl; - /**0帖子1名片2作品*/ - @Excel(name = "0帖子1名片2作品", width = 15) - @ApiModelProperty(value = "0帖子1名片2作品") + /**类型*/ + @Excel(name = "类型", width = 15, dicCode = "banner_state") + @Dict(dicCode = "banner_state") + @ApiModelProperty(value = "类型") private java.lang.Integer type; - /**帖子*/ - @Excel(name = "帖子", width = 15, dictTable = "at_trends", dicText = "title", dicCode = "id") + /**帖子标题*/ + @Excel(name = "帖子标题", width = 15, dictTable = "at_trends", dicText = "title", dicCode = "id") @Dict(dictTable = "at_trends", dicText = "title", dicCode = "id") - @ApiModelProperty(value = "帖子") + @ApiModelProperty(value = "帖子标题") private java.lang.String trendsId; - /**名片*/ - @Excel(name = "名片", width = 15, dictTable = "at_actor_collection", dicText = "name", dicCode = "id") + /**名片名称*/ + @Excel(name = "名片名称", width = 15, dictTable = "at_actor_collection", dicText = "name", dicCode = "id") @Dict(dictTable = "at_actor_collection", dicText = "name", dicCode = "id") - @ApiModelProperty(value = "名片") + @ApiModelProperty(value = "名片名称") private java.lang.String collectionId; - /**作品*/ - @Excel(name = "作品", width = 15, dictTable = "at_masterpiece", dicText = "title", dicCode = "id") + /**作品标题*/ + @Excel(name = "作品标题", width = 15, dictTable = "at_masterpiece", dicText = "title", dicCode = "id") @Dict(dictTable = "at_masterpiece", dicText = "title", dicCode = "id") - @ApiModelProperty(value = "作品") + @ApiModelProperty(value = "作品标题") private java.lang.String masterpieceId; } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiBanner/mapper/HanHaiBannerMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiBanner/mapper/HanHaiBannerMapper.java index 4df082e..6d43079 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiBanner/mapper/HanHaiBannerMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiBanner/mapper/HanHaiBannerMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 轮播广告 * @Author: jeecg-boot - * @Date: 2024-09-25 + * @Date: 2024-11-07 * @Version: V1.0 */ public interface HanHaiBannerMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiBanner/service/IHanHaiBannerService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiBanner/service/IHanHaiBannerService.java index 5915845..2d8761f 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiBanner/service/IHanHaiBannerService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiBanner/service/IHanHaiBannerService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 轮播广告 * @Author: jeecg-boot - * @Date: 2024-09-25 + * @Date: 2024-11-07 * @Version: V1.0 */ public interface IHanHaiBannerService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiBanner/service/impl/HanHaiBannerServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiBanner/service/impl/HanHaiBannerServiceImpl.java index 40f05d3..e4ad572 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiBanner/service/impl/HanHaiBannerServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiBanner/service/impl/HanHaiBannerServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 轮播广告 * @Author: jeecg-boot - * @Date: 2024-09-25 + * @Date: 2024-11-07 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiBanner/vue/HanHaiBannerList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiBanner/vue/HanHaiBannerList.vue index b164355..725bda9 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiBanner/vue/HanHaiBannerList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiBanner/vue/HanHaiBannerList.vue @@ -122,6 +122,12 @@ return parseInt(index)+1; } }, + { + title:'是否启用', + align:"center", + dataIndex: 'isOpen', + customRender: (text) => (text ? filterMultiDictText(this.dictOptions['isOpen'], text) : ''), + }, { title:'备注名称', align:"center", @@ -139,22 +145,22 @@ dataIndex: 'toUrl' }, { - title:'0帖子1名片2作品', + title:'类型', align:"center", - dataIndex: 'type' + dataIndex: 'type_dictText' }, { - title:'帖子', + title:'帖子标题', align:"center", dataIndex: 'trendsId_dictText' }, { - title:'名片', + title:'名片名称', align:"center", dataIndex: 'collectionId_dictText' }, { - title:'作品', + title:'作品标题', align:"center", dataIndex: 'masterpieceId_dictText' }, @@ -180,6 +186,7 @@ } }, created() { + this.$set(this.dictOptions, 'isOpen', [{text:'是',value:'Y'},{text:'否',value:'N'}]) this.getSuperFieldList(); }, computed: { @@ -192,13 +199,14 @@ }, getSuperFieldList(){ let fieldList=[]; + fieldList.push({type:'switch',value:'isOpen',text:'是否启用'}) fieldList.push({type:'string',value:'name',text:'备注名称',dictCode:''}) fieldList.push({type:'string',value:'image',text:'图片',dictCode:''}) fieldList.push({type:'string',value:'toUrl',text:'跳转地址',dictCode:''}) - fieldList.push({type:'int',value:'type',text:'0帖子1名片2作品',dictCode:''}) - fieldList.push({type:'sel_search',value:'trendsId',text:'帖子',dictTable:"at_trends", dictText:'title', dictCode:'id'}) - fieldList.push({type:'sel_search',value:'collectionId',text:'名片',dictTable:"at_actor_collection", dictText:'name', dictCode:'id'}) - fieldList.push({type:'sel_search',value:'masterpieceId',text:'作品',dictTable:"at_masterpiece", dictText:'title', dictCode:'id'}) + fieldList.push({type:'int',value:'type',text:'类型',dictCode:'banner_state'}) + fieldList.push({type:'sel_search',value:'trendsId',text:'帖子标题',dictTable:"at_trends", dictText:'title', dictCode:'id'}) + fieldList.push({type:'sel_search',value:'collectionId',text:'名片名称',dictTable:"at_actor_collection", dictText:'name', dictCode:'id'}) + fieldList.push({type:'sel_search',value:'masterpieceId',text:'作品标题',dictTable:"at_masterpiece", dictText:'title', dictCode:'id'}) this.superFieldList = fieldList } } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiBanner/vue/modules/HanHaiBannerForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiBanner/vue/modules/HanHaiBannerForm.vue index 5391ee6..3e2af8b 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiBanner/vue/modules/HanHaiBannerForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiBanner/vue/modules/HanHaiBannerForm.vue @@ -3,6 +3,11 @@ + + + + + @@ -19,22 +24,22 @@ - - + + - + - + - + diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiBanner/vue3/HanHaiBanner.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiBanner/vue3/HanHaiBanner.data.ts index 785a083..88ab3b7 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiBanner/vue3/HanHaiBanner.data.ts +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiBanner/vue3/HanHaiBanner.data.ts @@ -5,6 +5,14 @@ import { render } from '/@/utils/common/renderUtils'; //列表数据 export const columns: BasicColumn[] = [ { + title: '是否启用', + align:"center", + dataIndex: 'isOpen', + customRender:({text}) => { + return render.renderSwitch(text, [{text:'是',value:'Y'},{text:'否',value:'N'}]) + }, + }, + { title: '备注名称', align:"center", dataIndex: 'name' @@ -21,22 +29,22 @@ export const columns: BasicColumn[] = [ dataIndex: 'toUrl' }, { - title: '0帖子1名片2作品', + title: '类型', align:"center", - dataIndex: 'type' + dataIndex: 'type_dictText' }, { - title: '帖子', + title: '帖子标题', align:"center", dataIndex: 'trendsId_dictText' }, { - title: '名片', + title: '名片名称', align:"center", dataIndex: 'collectionId_dictText' }, { - title: '作品', + title: '作品标题', align:"center", dataIndex: 'masterpieceId_dictText' }, @@ -46,6 +54,13 @@ export const searchFormSchema: FormSchema[] = [ ]; //表单数据 export const formSchema: FormSchema[] = [ + { + label: '是否启用', + field: 'isOpen', + component: 'JSwitch', + componentProps:{ + }, + }, { label: '备注名称', field: 'name', @@ -64,12 +79,15 @@ export const formSchema: FormSchema[] = [ component: 'Input', }, { - label: '0帖子1名片2作品', + label: '类型', field: 'type', - component: 'InputNumber', + component: 'JDictSelectTag', + componentProps:{ + dictCode:"banner_state" + }, }, { - label: '帖子', + label: '帖子标题', field: 'trendsId', component: 'JSearchSelect', componentProps:{ @@ -77,7 +95,7 @@ export const formSchema: FormSchema[] = [ }, }, { - label: '名片', + label: '名片名称', field: 'collectionId', component: 'JSearchSelect', componentProps:{ @@ -85,7 +103,7 @@ export const formSchema: FormSchema[] = [ }, }, { - label: '作品', + label: '作品标题', field: 'masterpieceId', component: 'JSearchSelect', componentProps:{ diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/controller/HanHaiRealEnterpriseController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/controller/HanHaiRealEnterpriseController.java index c232e32..9cf6716 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/controller/HanHaiRealEnterpriseController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/controller/HanHaiRealEnterpriseController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 企业实名认证 * @Author: jeecg-boot - * @Date: 2024-09-26 + * @Date: 2024-11-07 * @Version: V1.0 */ @Api(tags="企业实名认证") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/entity/HanHaiRealEnterprise.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/entity/HanHaiRealEnterprise.java index 240636f..dff121b 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/entity/HanHaiRealEnterprise.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/entity/HanHaiRealEnterprise.java @@ -20,7 +20,7 @@ import lombok.experimental.Accessors; /** * @Description: 企业实名认证 * @Author: jeecg-boot - * @Date: 2024-09-26 + * @Date: 2024-11-07 * @Version: V1.0 */ @Data @@ -84,4 +84,16 @@ public class HanHaiRealEnterprise implements Serializable { @Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") @ApiModelProperty(value = "用户标识") private java.lang.String userId; + /**是否支付*/ + @Excel(name = "是否支付", width = 15) + @ApiModelProperty(value = "是否支付") + private java.lang.String isPay; + /**支付金额*/ + @Excel(name = "支付金额", width = 15) + @ApiModelProperty(value = "支付金额") + private java.math.BigDecimal payMoney; + /**支付时间*/ + @Excel(name = "支付时间", width = 15) + @ApiModelProperty(value = "支付时间") + private java.util.Date payTime; } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/mapper/HanHaiRealEnterpriseMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/mapper/HanHaiRealEnterpriseMapper.java index 578be98..cfe7af4 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/mapper/HanHaiRealEnterpriseMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/mapper/HanHaiRealEnterpriseMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 企业实名认证 * @Author: jeecg-boot - * @Date: 2024-09-26 + * @Date: 2024-11-07 * @Version: V1.0 */ public interface HanHaiRealEnterpriseMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/service/IHanHaiRealEnterpriseService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/service/IHanHaiRealEnterpriseService.java index c405503..629f3f4 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/service/IHanHaiRealEnterpriseService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/service/IHanHaiRealEnterpriseService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 企业实名认证 * @Author: jeecg-boot - * @Date: 2024-09-26 + * @Date: 2024-11-07 * @Version: V1.0 */ public interface IHanHaiRealEnterpriseService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/service/impl/HanHaiRealEnterpriseServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/service/impl/HanHaiRealEnterpriseServiceImpl.java index d764abf..2bf0e5f 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/service/impl/HanHaiRealEnterpriseServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/service/impl/HanHaiRealEnterpriseServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 企业实名认证 * @Author: jeecg-boot - * @Date: 2024-09-26 + * @Date: 2024-11-07 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue/HanHaiRealEnterpriseList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue/HanHaiRealEnterpriseList.vue index 9fa9918..4be9a79 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue/HanHaiRealEnterpriseList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue/HanHaiRealEnterpriseList.vue @@ -187,6 +187,22 @@ align:"center", dataIndex: 'userId_dictText' }, + { + title:'是否支付', + align:"center", + dataIndex: 'isPay', + customRender: (text) => (text ? filterMultiDictText(this.dictOptions['isPay'], text) : ''), + }, + { + title:'支付金额', + align:"center", + dataIndex: 'payMoney' + }, + { + title:'支付时间', + align:"center", + dataIndex: 'payTime' + }, { title: '操作', dataIndex: 'action', @@ -209,6 +225,7 @@ } }, created() { + this.$set(this.dictOptions, 'isPay', [{text:'是',value:'Y'},{text:'否',value:'N'}]) this.getSuperFieldList(); }, computed: { @@ -230,6 +247,9 @@ fieldList.push({type:'string',value:'imageStraight',text:'身份证正面',dictCode:''}) fieldList.push({type:'string',value:'imageReverseSide',text:'身份证反面',dictCode:''}) fieldList.push({type:'sel_search',value:'userId',text:'用户标识',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'}) + fieldList.push({type:'switch',value:'isPay',text:'是否支付'}) + fieldList.push({type:'BigDecimal',value:'payMoney',text:'支付金额',dictCode:''}) + fieldList.push({type:'datetime',value:'payTime',text:'支付时间'}) this.superFieldList = fieldList } } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue/modules/HanHaiRealEnterpriseForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue/modules/HanHaiRealEnterpriseForm.vue index ab18155..af500c3 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue/modules/HanHaiRealEnterpriseForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue/modules/HanHaiRealEnterpriseForm.vue @@ -43,6 +43,21 @@ + + + + + + + + + + + + + + + diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue3/HanHaiRealEnterprise.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue3/HanHaiRealEnterprise.data.ts index 37f1f2f..dbb66b2 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue3/HanHaiRealEnterprise.data.ts +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealEnterprise/vue3/HanHaiRealEnterprise.data.ts @@ -54,6 +54,24 @@ export const columns: BasicColumn[] = [ align:"center", dataIndex: 'userId_dictText' }, + { + title: '是否支付', + align:"center", + dataIndex: 'isPay', + customRender:({text}) => { + return render.renderSwitch(text, [{text:'是',value:'Y'},{text:'否',value:'N'}]) + }, + }, + { + title: '支付金额', + align:"center", + dataIndex: 'payMoney' + }, + { + title: '支付时间', + align:"center", + dataIndex: 'payTime' + }, ]; //查询数据 export const searchFormSchema: FormSchema[] = [ @@ -123,4 +141,21 @@ export const formSchema: FormSchema[] = [ dict:"han_hai_member,nick_name,id" }, }, + { + label: '是否支付', + field: 'isPay', + component: 'JSwitch', + componentProps:{ + }, + }, + { + label: '支付金额', + field: 'payMoney', + component: 'InputNumber', + }, + { + label: '支付时间', + field: 'payTime', + component: 'Input', + }, ]; diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/controller/HanHaiRealNameController.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/controller/HanHaiRealNameController.java index e262db8..5361167 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/controller/HanHaiRealNameController.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/controller/HanHaiRealNameController.java @@ -39,7 +39,7 @@ import org.jeecg.common.aspect.annotation.AutoLog; /** * @Description: 个人实名认证表 * @Author: jeecg-boot - * @Date: 2024-09-26 + * @Date: 2024-11-07 * @Version: V1.0 */ @Api(tags="个人实名认证表") diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/entity/HanHaiRealName.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/entity/HanHaiRealName.java index 27fa818..4f4dbd6 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/entity/HanHaiRealName.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/entity/HanHaiRealName.java @@ -20,7 +20,7 @@ import lombok.experimental.Accessors; /** * @Description: 个人实名认证表 * @Author: jeecg-boot - * @Date: 2024-09-26 + * @Date: 2024-11-07 * @Version: V1.0 */ @Data @@ -69,7 +69,20 @@ public class HanHaiRealName implements Serializable { @ApiModelProperty(value = "证件号码") private java.lang.String card; /**用户标识*/ - @Excel(name = "用户标识", width = 15) + @Excel(name = "用户标识", width = 15, dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") + @Dict(dictTable = "han_hai_member", dicText = "nick_name", dicCode = "id") @ApiModelProperty(value = "用户标识") private java.lang.String userId; + /**是否支付*/ + @Excel(name = "是否支付", width = 15) + @ApiModelProperty(value = "是否支付") + private java.lang.String isPay; + /**支付金额*/ + @Excel(name = "支付金额", width = 15) + @ApiModelProperty(value = "支付金额") + private java.math.BigDecimal payMoney; + /**支付时间*/ + @Excel(name = "支付时间", width = 15) + @ApiModelProperty(value = "支付时间") + private java.util.Date payTime; } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/mapper/HanHaiRealNameMapper.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/mapper/HanHaiRealNameMapper.java index b3594b8..9fc1fe7 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/mapper/HanHaiRealNameMapper.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/mapper/HanHaiRealNameMapper.java @@ -9,7 +9,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; /** * @Description: 个人实名认证表 * @Author: jeecg-boot - * @Date: 2024-09-26 + * @Date: 2024-11-07 * @Version: V1.0 */ public interface HanHaiRealNameMapper extends BaseMapper { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/service/IHanHaiRealNameService.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/service/IHanHaiRealNameService.java index 8ceb05a..6a7d1c5 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/service/IHanHaiRealNameService.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/service/IHanHaiRealNameService.java @@ -6,7 +6,7 @@ import com.baomidou.mybatisplus.extension.service.IService; /** * @Description: 个人实名认证表 * @Author: jeecg-boot - * @Date: 2024-09-26 + * @Date: 2024-11-07 * @Version: V1.0 */ public interface IHanHaiRealNameService extends IService { diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/service/impl/HanHaiRealNameServiceImpl.java b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/service/impl/HanHaiRealNameServiceImpl.java index 351d22b..62adabd 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/service/impl/HanHaiRealNameServiceImpl.java +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/service/impl/HanHaiRealNameServiceImpl.java @@ -10,7 +10,7 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; /** * @Description: 个人实名认证表 * @Author: jeecg-boot - * @Date: 2024-09-26 + * @Date: 2024-11-07 * @Version: V1.0 */ @Service diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/vue/HanHaiRealNameList.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/vue/HanHaiRealNameList.vue index c53f7a3..a366723 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/vue/HanHaiRealNameList.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/vue/HanHaiRealNameList.vue @@ -173,7 +173,23 @@ { title:'用户标识', align:"center", - dataIndex: 'userId' + dataIndex: 'userId_dictText' + }, + { + title:'是否支付', + align:"center", + dataIndex: 'isPay', + customRender: (text) => (text ? filterMultiDictText(this.dictOptions['isPay'], text) : ''), + }, + { + title:'支付金额', + align:"center", + dataIndex: 'payMoney' + }, + { + title:'支付时间', + align:"center", + dataIndex: 'payTime' }, { title: '操作', @@ -197,6 +213,7 @@ } }, created() { + this.$set(this.dictOptions, 'isPay', [{text:'是',value:'Y'},{text:'否',value:'N'}]) this.getSuperFieldList(); }, computed: { @@ -215,7 +232,10 @@ fieldList.push({type:'string',value:'imageReverseSide',text:'反面',dictCode:''}) fieldList.push({type:'string',value:'name',text:'姓名',dictCode:''}) fieldList.push({type:'string',value:'card',text:'证件号码',dictCode:''}) - fieldList.push({type:'string',value:'userId',text:'用户标识',dictCode:''}) + fieldList.push({type:'sel_search',value:'userId',text:'用户标识',dictTable:"han_hai_member", dictText:'nick_name', dictCode:'id'}) + fieldList.push({type:'switch',value:'isPay',text:'是否支付'}) + fieldList.push({type:'BigDecimal',value:'payMoney',text:'支付金额',dictCode:''}) + fieldList.push({type:'datetime',value:'payTime',text:'支付时间'}) this.superFieldList = fieldList } } diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/vue/modules/HanHaiRealNameForm.vue b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/vue/modules/HanHaiRealNameForm.vue index 5a819fd..bf9af1d 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/vue/modules/HanHaiRealNameForm.vue +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/vue/modules/HanHaiRealNameForm.vue @@ -30,7 +30,22 @@ - + + + + + + + + + + + + + + + + diff --git a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/vue3/HanHaiRealName.data.ts b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/vue3/HanHaiRealName.data.ts index 263762e..1235dbb 100644 --- a/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/vue3/HanHaiRealName.data.ts +++ b/jeecg-boot-base/jeecg-boot-base-core/src/main/java/org/jeecg/modules/hanHaiRealName/vue3/HanHaiRealName.data.ts @@ -40,7 +40,25 @@ export const columns: BasicColumn[] = [ { title: '用户标识', align:"center", - dataIndex: 'userId' + dataIndex: 'userId_dictText' + }, + { + title: '是否支付', + align:"center", + dataIndex: 'isPay', + customRender:({text}) => { + return render.renderSwitch(text, [{text:'是',value:'Y'},{text:'否',value:'N'}]) + }, + }, + { + title: '支付金额', + align:"center", + dataIndex: 'payMoney' + }, + { + title: '支付时间', + align:"center", + dataIndex: 'payTime' }, ]; //查询数据 @@ -92,6 +110,26 @@ export const formSchema: FormSchema[] = [ { label: '用户标识', field: 'userId', + component: 'JSearchSelect', + componentProps:{ + dict:"han_hai_member,nick_name,id" + }, + }, + { + label: '是否支付', + field: 'isPay', + component: 'JSwitch', + componentProps:{ + }, + }, + { + label: '支付金额', + field: 'payMoney', + component: 'InputNumber', + }, + { + label: '支付时间', + field: 'payTime', component: 'Input', }, ]; diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/noticeapicontroller/OrderApiController.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/noticeapicontroller/OrderApiController.java index 9764f18..79e844b 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/noticeapicontroller/OrderApiController.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/api/noticeapicontroller/OrderApiController.java @@ -54,6 +54,13 @@ public class OrderApiController { } + //支付回调 + @PostMapping("/notify3") + public Object createNotify3(@RequestBody String requestBody){ + return orderApiService.createNotify3(requestBody); + } + + } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/OrderApiService.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/OrderApiService.java index adea326..28a2943 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/OrderApiService.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/OrderApiService.java @@ -15,4 +15,6 @@ public interface OrderApiService { Object createNotify(String requestBody); Object createNotify2(String requestBody); + + Object createNotify3(String requestBody); } diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/IndexApiServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/IndexApiServiceImpl.java index f6f2fdb..a699415 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/IndexApiServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/IndexApiServiceImpl.java @@ -30,6 +30,8 @@ import org.jeecg.modules.atTrends.service.IAtTrendsService; import org.jeecg.modules.bean.WaterPageBean; import org.jeecg.modules.hanHaiBanner.entity.HanHaiBanner; import org.jeecg.modules.hanHaiBanner.service.IHanHaiBannerService; +import org.jeecg.modules.hanHaiConf.entity.HanHaiConf; +import org.jeecg.modules.hanHaiConf.service.IHanHaiConfService; import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService; import org.jeecg.modules.hanHaiWater.entity.HanHaiWater; @@ -90,7 +92,9 @@ public class IndexApiServiceImpl implements IndexApiService { //流水信息 @Resource private IHanHaiWaterService hanHaiWaterService; - + //协议接口 + @Resource + private IHanHaiConfService hanHaiConfService; @@ -98,7 +102,10 @@ public class IndexApiServiceImpl implements IndexApiService { // 获取banner列表 @Override public Result getBanner(){ - List list = hanHaiBannerService.list(); + List list = hanHaiBannerService + .lambdaQuery() + .eq(HanHaiBanner::getIsOpen,"Y") + .list(); return Result.OK("轮播图列表",list); } //获取认证演员 @@ -109,12 +116,17 @@ public class IndexApiServiceImpl implements IndexApiService { .eq(AtActorCollection::getState,1) .orderByDesc(AtActorCollection::getCreateTime) .list(); + //根据配置列表获得联系方式查看费用 + HanHaiConf phonePrice = hanHaiConfService.lambdaQuery().eq(HanHaiConf::getKeyValue, "phonePrice").one(); + //转化为BigDecimal + BigDecimal price = new BigDecimal(phonePrice.getContent()); //创建一个新的集合 List newList = new ArrayList<>(); for (AtActorCollection performer:list) { performer.setUserId(hanHaiMemberService .lambdaQuery() .eq(HanHaiMember::getId,performer.getUserId()).one().getNickName()); + performer.setPrice(price); newList.add(performer); } return Result.OK("认证演员列表",newList); @@ -149,6 +161,7 @@ public class IndexApiServiceImpl implements IndexApiService { atTrends.setUserId(hanHaiMemberService .lambdaQuery() .eq(HanHaiMember::getId,atTrends.getUserId()).one().getNickName()); + recordsNew.add(atTrends); } pageList.setRecords(recordsNew); @@ -283,8 +296,20 @@ public class IndexApiServiceImpl implements IndexApiService { .like(AtActorCollection::getTitle,bean.getTitle()) .orderByDesc(AtActorCollection::getCreateTime) .page(page); + } + //循环添加用户昵称 + List records = pageList.getRecords(); + //创建新集合 + List recordsNew = new ArrayList<>(); + for (AtActorCollection atActorCollection:records) { + HanHaiMember byId1 = hanHaiMemberService.getById(atActorCollection.getUserId()); + atActorCollection.setIdCardOpen(byId1.getIdCardOpen()); + recordsNew.add(atActorCollection); + } + pageList.setRecords(recordsNew); + return Result.OK("演员集列表", pageList); } @@ -296,6 +321,13 @@ public class IndexApiServiceImpl implements IndexApiService { //根据用户标识查询发布人信息 HanHaiMember byId1 = hanHaiMemberService.getById(byId.getUserId()); byId.setUserId(byId1.getNickName()); + byId.setIdCardOpen(byId1.getIdCardOpen()); + + //根据配置列表获得联系方式查看费用 + HanHaiConf phonePrice = hanHaiConfService.lambdaQuery().eq(HanHaiConf::getKeyValue, "phonePrice").one(); + //转化为BigDecimal + BigDecimal price = new BigDecimal(phonePrice.getContent()); + byId.setPrice(price); Map map = new HashMap<>(); //作品0/演员1/动态2 diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/InfoApiServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/InfoApiServiceImpl.java index 0fd9028..375e57b 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/InfoApiServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/InfoApiServiceImpl.java @@ -24,6 +24,8 @@ import org.jeecg.modules.atMasterPiece.entity.AtMasterPiece; import org.jeecg.modules.atMasterPiece.service.IAtMasterPieceService; import org.jeecg.modules.atOrder.entity.AtOrder; import org.jeecg.modules.atOrder.service.IAtOrderService; +import org.jeecg.modules.atPayOrder.entity.AtPayOrder; +import org.jeecg.modules.atPayOrder.service.IAtPayOrderService; import org.jeecg.modules.atPhoneOrder.entity.AtPhoneOrder; import org.jeecg.modules.atPhoneOrder.service.IAtPhoneOrderService; import org.jeecg.modules.atPromotion.entity.AtPromotion; @@ -36,6 +38,8 @@ import org.jeecg.modules.atTrends.entity.AtTrends; import org.jeecg.modules.atTrends.service.IAtTrendsService; import org.jeecg.modules.hanHaiBank.entity.HanHaiBank; import org.jeecg.modules.hanHaiBank.service.IHanHaiBankService; +import org.jeecg.modules.hanHaiConf.entity.HanHaiConf; +import org.jeecg.modules.hanHaiConf.service.IHanHaiConfService; import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService; import org.jeecg.modules.hanHaiRealEnterprise.entity.HanHaiRealEnterprise; @@ -105,6 +109,8 @@ public class InfoApiServiceImpl implements InfoApiService { //点赞 @Resource private IAtThumbsLogService atThumbsLogService; + @Resource + private IHanHaiConfService hanHaiConfService; //举报 @Resource private IAtComplaintLogService atComplaintLogService; @@ -124,6 +130,10 @@ public class InfoApiServiceImpl implements InfoApiService { @Resource private IAtFeedbackService atFeedbackService; + //实名认证支付费用 + + @Resource + private IAtPayOrderService atPayOrderService; @@ -340,7 +350,7 @@ public class InfoApiServiceImpl implements InfoApiService { .eq(HanHaiRealName::getUserId, hanHaiMember.getId()) .one(); if(null != one){ - return Result.OK("您已提交过实名认证，请勿重复提交！"); + return Result.error("您已提交过实名认证，请勿重复提交！"); } String imageStraight = hanHaiRealNameBean.getImageStraight(); @@ -352,51 +362,74 @@ public class InfoApiServiceImpl implements InfoApiService { if(null != imageStraight){ haiRealName.setImageStraight(imageStraight); }else{ - return Result.OK("身份证正面照未上传！"); + return Result.error("身份证正面照未上传！"); } if(null != imageReverseSide){ haiRealName.setImageReverseSide(imageReverseSide); }else{ - return Result.OK("身份证反面照未上传！"); + return Result.error("身份证反面照未上传！"); } if(null != name){ haiRealName.setName(name); }else{ - return Result.OK("姓名未上传！"); + return Result.error("姓名未上传！"); } if(null != card){ haiRealName.setName(card); }else{ - return Result.OK("身份证号码未上传！"); + return Result.error("身份证号码未上传！"); } haiRealName.setUserId(hanHaiMember.getId()); haiRealName.setCard(card); - + String order = System.currentTimeMillis()+""; boolean result = hanHaiRealNameService.save(haiRealName); - //修改个人信息状态为个人实名 - hanHaiMember.setIdCardOpen("1"); - hanHaiMemberService.updateById(hanHaiMember); +// //修改个人信息状态为个人实名 +// hanHaiMember.setIdCardOpen("1"); +// hanHaiMemberService.updateById(hanHaiMember); - //创建支付订单 + //根据配置获取个人认证费用 + String user_money = hanHaiConfService + .lambdaQuery() + .eq(HanHaiConf::getKeyValue, "user_money") + .one() + .getContent(); + BigDecimal money = new BigDecimal(user_money); - //获取当前置顶价格 - BigDecimal money = new BigDecimal("0.01"); +// //获取当前置顶价格 +// BigDecimal money = new BigDecimal("0.01"); //吊起微信支付 String s = money.multiply(new BigDecimal(100)).toString(); int i1 = Double.valueOf(s).intValue(); //创建支付订单 - Object appOrder = mpWxPayService.createOrder2( - "实名认证" , + AtPayOrder atPayOrder = new AtPayOrder(); + String orderId = System.currentTimeMillis()+""; + atPayOrder.setId(orderId); + atPayOrder.setUserId(hanHaiMember.getId()); + atPayOrder.setMoney(money); + atPayOrder.setType(0); //个人认证 + atPayOrder.setState(0); + atPayOrder.setTitle(name+"个人实名认证"); + atPayOrder.setCreateTime(new Date()); + atPayOrder.setOrderId(order); + atPayOrderService.save(atPayOrder); + + + + + + //创建支付订单 + Object appOrder = mpWxPayService.createOrder3( + atPayOrder.getTitle(), "127.0.0.1", - System.currentTimeMillis()+"", + orderId, i1, - System.currentTimeMillis()+"", + orderId, hanHaiMember.getAppletOpenid(), "{}"); @@ -419,7 +452,7 @@ public class InfoApiServiceImpl implements InfoApiService { .eq(HanHaiRealEnterprise::getUserId, hanHaiMember.getId()) .one(); if(null != one){ - return Result.OK("您已提交过企业认证，请勿重复提交！"); + return Result.error("您已提交过企业认证，请勿重复提交！"); } String imageStraight = hanHaiRealEnterpriseBean.getImageStraight(); @@ -433,58 +466,83 @@ public class InfoApiServiceImpl implements InfoApiService { if(null != imageStraight){ haiRealEnterprise.setImageStraight(imageStraight); }else { - return Result.OK("身份证正面照未上传！"); + return Result.error("身份证正面照未上传！"); } if(null != imageReverseSide){ haiRealEnterprise.setImageReverseSide(imageReverseSide); }else { - return Result.OK("身份证反面照未上传！"); + return Result.error("身份证反面照未上传！"); } if(null != name){ haiRealEnterprise.setName(name); }else{ - return Result.OK("法人真实姓名未上传！"); + return Result.error("法人真实姓名未上传！"); } if(null != card){ haiRealEnterprise.setName(card); }else{ - return Result.OK("法人身份证号码未上传！"); + return Result.error("法人身份证号码未上传！"); } if(null != card){ haiRealEnterprise.setTradeImage(tradeImage); }else{ - return Result.OK("营业执照未上传！"); + return Result.error("营业执照未上传！"); } if(null != card){ haiRealEnterprise.setOtherImage(otherImage); }else{ - return Result.OK("其他资质未上传！"); + return Result.error("其他资质未上传！"); } haiRealEnterprise.setUserId(hanHaiMember.getId()); haiRealEnterprise.setCard(card); + String order = System.currentTimeMillis()+""; + haiRealEnterprise.setId(order); Boolean result = hanHaiRealEnterpriseService.save(haiRealEnterprise); - //修改个人信息状态为企业 - hanHaiMember.setIdCardOpen("2"); - hanHaiMemberService.updateById(hanHaiMember); +// //修改个人信息状态为企业 +// hanHaiMember.setIdCardOpen("2"); +// hanHaiMemberService.updateById(hanHaiMember); //获取当前置顶价格 - BigDecimal money = new BigDecimal("0.01"); +// BigDecimal money = new BigDecimal("0.01"); + //根据配置获取个人认证费用 + String enterprise_money = hanHaiConfService + .lambdaQuery() + .eq(HanHaiConf::getKeyValue, "enterprise_money") + .one() + .getContent(); + BigDecimal money = new BigDecimal(enterprise_money); + //吊起微信支付 String s = money.multiply(new BigDecimal(100)).toString(); int i1 = Double.valueOf(s).intValue(); //创建支付订单 - Object appOrder = mpWxPayService.createOrder2( - "实名认证" , + AtPayOrder atPayOrder = new AtPayOrder(); + String orderId = System.currentTimeMillis()+""; + atPayOrder.setId(orderId); + atPayOrder.setUserId(hanHaiMember.getId()); + atPayOrder.setMoney(money); + atPayOrder.setType(1); //企业实名认证 + atPayOrder.setState(0); + atPayOrder.setTitle(name+"企业实名认证"); + atPayOrder.setCreateTime(new Date()); + atPayOrder.setOrderId(order); + + atPayOrderService.save(atPayOrder); + + + //创建支付订单 + Object appOrder = mpWxPayService.createOrder3( + atPayOrder.getTitle(), "127.0.0.1", - System.currentTimeMillis()+"", + orderId, i1, - System.currentTimeMillis()+"", + orderId, hanHaiMember.getAppletOpenid(), "{}"); @@ -929,10 +987,15 @@ public class InfoApiServiceImpl implements InfoApiService { return Result.OK("已支付,请不要重复支付"); } + //根据配置列表获得联系方式查看费用 + HanHaiConf phonePrice = hanHaiConfService.lambdaQuery().eq(HanHaiConf::getKeyValue, "phonePrice").one(); + //转化为BigDecimal + BigDecimal price = new BigDecimal(phonePrice.getContent()); + //获取当前置顶价格 - BigDecimal price = one.getPrice(); +// BigDecimal price = one.getPrice(); //吊起微信支付 String s = price.multiply(new BigDecimal(100)).toString(); int i1 = Double.valueOf(s).intValue(); diff --git a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/OrderApiServiceImpl.java b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/OrderApiServiceImpl.java index 6b23615..a31169d 100644 --- a/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/OrderApiServiceImpl.java +++ b/jeecg-boot-module-system/src/main/java/org/jeecg/modules/apiservice/impl/OrderApiServiceImpl.java @@ -8,6 +8,8 @@ import org.jeecg.modules.atActorCollection.entity.AtActorCollection; import org.jeecg.modules.atActorCollection.service.IAtActorCollectionService; import org.jeecg.modules.atOrder.entity.AtOrder; import org.jeecg.modules.atOrder.service.IAtOrderService; +import org.jeecg.modules.atPayOrder.entity.AtPayOrder; +import org.jeecg.modules.atPayOrder.service.IAtPayOrderService; import org.jeecg.modules.atPhoneOrder.entity.AtPhoneOrder; import org.jeecg.modules.atPhoneOrder.service.IAtPhoneOrderService; import org.jeecg.modules.atTrends.entity.AtTrends; @@ -16,6 +18,10 @@ import org.jeecg.modules.hanHaiConf.entity.HanHaiConf; import org.jeecg.modules.hanHaiConf.service.IHanHaiConfService; import org.jeecg.modules.hanHaiMember.entity.HanHaiMember; import org.jeecg.modules.hanHaiMember.service.IHanHaiMemberService; +import org.jeecg.modules.hanHaiRealEnterprise.entity.HanHaiRealEnterprise; +import org.jeecg.modules.hanHaiRealEnterprise.service.IHanHaiRealEnterpriseService; +import org.jeecg.modules.hanHaiRealName.entity.HanHaiRealName; +import org.jeecg.modules.hanHaiRealName.service.IHanHaiRealNameService; import org.jeecg.modules.hanHaiWater.entity.HanHaiWater; import org.jeecg.modules.hanHaiWater.service.IHanHaiWaterService; import org.jeecg.modules.pay.MpWxPayService; @@ -54,6 +60,15 @@ public class OrderApiServiceImpl implements OrderApiService { //流失 @Resource private IHanHaiMemberService hanHaiMemberService; + //流失 + @Resource + private IAtPayOrderService atPayOrderService; + //获取个人认证信息 + @Resource + private IHanHaiRealNameService hanHaiRealNameService; + //获取企业认证信息 + @Resource + private IHanHaiRealEnterpriseService hanHaiRealEnterpriseService; @@ -166,4 +181,59 @@ public class OrderApiServiceImpl implements OrderApiService { + + //支付回调 + @Override + public Object createNotify3(String requestBody){ + WxPayOrderNotifyResult notify = mpWxPayService.notify(requestBody); + String outTradeNo = notify.getOutTradeNo(); + AtPayOrder byId = atPayOrderService.getById(outTradeNo); + System.out.println("进入了支付回调"); + System.out.println(byId); + //如果不为空则修改支付状态 + if(byId!=null) + { + if (byId.getState() == 0){ + byId.setState(1); + atPayOrderService.updateById(byId); + //获取个人信息 + HanHaiMember hanHaiMember = hanHaiMemberService.getById(byId.getUserId()); + if(byId.getType() == 0){ + //根据byId.getOrderId()查询个人认证信息 + HanHaiRealName realName = hanHaiRealNameService.getById(byId.getOrderId()); + //修改认证信息状态为已认证 + realName.setState(1); + realName.setPayMoney(byId.getMoney()); + realName.setPayTime(new Date()); + realName.setIsPay("Y"); + hanHaiRealNameService.updateById(realName); + + + + + //修改个人信息状态为企业 + hanHaiMember.setIdCardOpen("1"); + hanHaiMemberService.updateById(hanHaiMember); + }else{ + + //根据byId.getOrderId()查询企业认证信息 + HanHaiRealEnterprise realEnterprise = hanHaiRealEnterpriseService.getById(byId.getOrderId()); + realEnterprise.setState(1); + realEnterprise.setPayMoney(byId.getMoney()); + realEnterprise.setPayTime(new Date()); + realEnterprise.setIsPay("Y"); + hanHaiRealEnterpriseService.updateById(realEnterprise); + + //修改个人信息状态为企业 + hanHaiMember.setIdCardOpen("2"); + hanHaiMemberService.updateById(hanHaiMember); + } + + + } + } + + return null; + } + }