diff --git a/Cpop-Generator/src/main/java/com/cpop/generator/CpopGenerator.java b/Cpop-Generator/src/main/java/com/cpop/generator/CpopGenerator.java index cfc90dd..b2b038a 100644 --- a/Cpop-Generator/src/main/java/com/cpop/generator/CpopGenerator.java +++ b/Cpop-Generator/src/main/java/com/cpop/generator/CpopGenerator.java @@ -40,17 +40,17 @@ public class CpopGenerator { /** * 输出路径 */ - private static final String EXPORT_URL = "/Cpop-Jambox"; + private static final String EXPORT_URL = "/Cpop-Mini"; /** * 模块 */ - private static final String EXPORT_ITEM = "jambox"; + private static final String EXPORT_ITEM = "mini"; /** * 表前缀 */ - private static final String TABLE_PREFIX = "cp_j_"; + private static final String TABLE_PREFIX = "cp_mini_"; /** * 主入口 diff --git a/Cpop-Jambox/src/main/java/com/cpop/jambox/business/controller/backstage/EasyLearnController.java b/Cpop-Jambox/src/main/java/com/cpop/jambox/business/controller/backstage/EasyLearnController.java new file mode 100644 index 0000000..84ebc48 --- /dev/null +++ b/Cpop-Jambox/src/main/java/com/cpop/jambox/business/controller/backstage/EasyLearnController.java @@ -0,0 +1,66 @@ +package com.cpop.jambox.business.controller.backstage; + +import com.alibaba.excel.EasyExcel; +import com.cpop.core.base.R; +import com.cpop.jambox.business.bo.EasyLearnPageBo; +import com.cpop.jambox.business.bo.EasyLearnUnifiedPayBo; +import com.cpop.jambox.business.bo.EasyLearnUnionPayBo; +import com.cpop.jambox.business.bo.OncePlaceOrderBo; +import com.cpop.jambox.business.dto.EasyLearnPageDto; +import com.cpop.jambox.business.service.EasyLearnOrderService; +import com.cpop.jambox.business.vo.EasyLearnPageVo; +import com.mybatisflex.core.paginate.Page; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import io.swagger.annotations.ApiParam; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.validation.annotation.Validated; +import org.springframework.web.bind.annotation.*; + +import javax.servlet.http.HttpServletResponse; +import java.io.IOException; +import java.net.URLEncoder; + +/** + * 果酱-放心学订单表 控制层。 + * + * @author DB + * @since 2023-12-14 + */ +@RestController +@Api(tags = "果酱-放心学订单表接口") +@RequestMapping("/easyLearn") +@Deprecated +public class EasyLearnController { + + @Autowired + private EasyLearnOrderService easyLearnOrderService; + + /** + * 一次性支付下单 + * @author DB + * @since 2023/10/23 12:15 + * @param bo 下单请求对象 + * @return com.cpop.core.base.R + */ + @PostMapping("/oncePlaceOrder") + @ApiOperation("一次性支付下单") + public R oncePlaceOrder(@RequestBody @Validated @ApiParam("一次性支付") OncePlaceOrderBo bo) { + return R.ok(easyLearnOrderService.oncePlaceOrder(bo)); + } + + /** + * 放心学统一支付 + * @author DB + * @since 2023/12/28 + * @param bo 请求参数 + * @return R + */ + @Deprecated + @PostMapping("/unionPay") + @ApiOperation("放心学统一支付") + public R unionPay(@RequestBody @Validated EasyLearnUnionPayBo bo) { + return R.ok(easyLearnOrderService.unionPay(bo)); + } + +} diff --git a/Cpop-Jambox/src/main/java/com/cpop/jambox/business/service/impl/EasyLearnOrderServiceImpl.java b/Cpop-Jambox/src/main/java/com/cpop/jambox/business/service/impl/EasyLearnOrderServiceImpl.java index 9e8dd50..cb16d4c 100644 --- a/Cpop-Jambox/src/main/java/com/cpop/jambox/business/service/impl/EasyLearnOrderServiceImpl.java +++ b/Cpop-Jambox/src/main/java/com/cpop/jambox/business/service/impl/EasyLearnOrderServiceImpl.java @@ -405,7 +405,6 @@ public class EasyLearnOrderServiceImpl extends ServiceImpl= Math.ceil(1 / OrderSource.EASY_LEARN.getRate())) { easyLearnOrder.setRate(OrderSource.EASY_LEARN.getRate()); @@ -558,7 +557,7 @@ public class EasyLearnOrderServiceImpl extends ServiceImpl list = DbChain.table("cp_mini_user").from("cp_mini_user").list(); + System.out.println(JSONArray.toJSONString(list)); + } +} diff --git a/Cpop-Mall/Cpop-Mall-Web/src/test/java/com/cpop/mall/web/CpopWxPayTests.java b/Cpop-Mall/Cpop-Mall-Web/src/test/java/com/cpop/mall/web/CpopWxPayTests.java index 8224ea0..02c2d71 100644 --- a/Cpop-Mall/Cpop-Mall-Web/src/test/java/com/cpop/mall/web/CpopWxPayTests.java +++ b/Cpop-Mall/Cpop-Mall-Web/src/test/java/com/cpop/mall/web/CpopWxPayTests.java @@ -51,11 +51,11 @@ public class CpopWxPayTests { WxPayRefundV3Request.Amount amount = new WxPayRefundV3Request.Amount(); //退款金额(单位分) //int refund = order.getTotalAmount().scaleByPowerOfTen(2).intValue(); - int refund = 500; + int refund = 100; amount.setRefund(refund) .setTotal(refund) .setCurrency("CNY"); - request.setTransactionId("4200002130202401237828582894") + request.setTransactionId("4200002127202401249900965739") //.setOutTradeNo("1000000000202401121937112562856") //.setTransactionId(order.getOutOrderNo()) //.setOutTradeNo(order.getId()) diff --git a/Cpop-Mini/src/main/java/com/cpop/mini/business/entity/MiniUserMidSys.java b/Cpop-Mini/src/main/java/com/cpop/mini/business/entity/MiniUserMidSys.java new file mode 100644 index 0000000..0fdbf3a --- /dev/null +++ b/Cpop-Mini/src/main/java/com/cpop/mini/business/entity/MiniUserMidSys.java @@ -0,0 +1,46 @@ +package com.cpop.mini.business.entity; + +import com.cpop.core.base.entity.BaseEntity; +import com.cpop.core.base.entity.BaseInsertListener; +import com.cpop.core.base.entity.BaseUpdateListener; +import com.mybatisflex.annotation.Id; +import com.mybatisflex.annotation.Table; +import java.io.Serializable; +import java.time.LocalDateTime; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import lombok.*; +import lombok.experimental.Accessors; + +/** + * 小程序用户-系统用户中间表 实体类。 + * + * @author DB + * @since 2024-01-24 + */ +@Data +@EqualsAndHashCode(callSuper=false) +@Builder +@NoArgsConstructor +@AllArgsConstructor +@Accessors(chain = true) +@Table(value = "cp_mini_user_mid_sys", onInsert = BaseInsertListener.class, onUpdate = BaseUpdateListener.class, mapperGenerateEnable = false) +public class MiniUserMidSys extends BaseEntity implements Serializable { + + /** + * 小程序用户id + */ + @Id + private String miniId; + + /** + * 用户id + */ + @Id + private String userId; + + + + + +} diff --git a/Cpop-Mini/src/main/java/com/cpop/mini/business/mapper/MiniUserMidSysMapper.java b/Cpop-Mini/src/main/java/com/cpop/mini/business/mapper/MiniUserMidSysMapper.java new file mode 100644 index 0000000..d927973 --- /dev/null +++ b/Cpop-Mini/src/main/java/com/cpop/mini/business/mapper/MiniUserMidSysMapper.java @@ -0,0 +1,14 @@ +package com.cpop.mini.business.mapper; + +import com.cpop.mini.business.entity.MiniUserMidSys; +import com.mybatisflex.core.BaseMapper; + +/** + * 小程序用户-系统用户中间表 映射层。 + * + * @author DB + * @since 2024-01-24 + */ +public interface MiniUserMidSysMapper extends BaseMapper { + +} diff --git a/Cpop-Mini/src/main/java/com/cpop/mini/business/service/MiniUserMidSysService.java b/Cpop-Mini/src/main/java/com/cpop/mini/business/service/MiniUserMidSysService.java new file mode 100644 index 0000000..0afc23e --- /dev/null +++ b/Cpop-Mini/src/main/java/com/cpop/mini/business/service/MiniUserMidSysService.java @@ -0,0 +1,14 @@ +package com.cpop.mini.business.service; + +import com.cpop.mini.business.entity.MiniUserMidSys; +import com.mybatisflex.core.service.IService; + +/** + * 小程序用户-系统用户中间表 服务层。 + * + * @author DB + * @since 2024-01-24 + */ +public interface MiniUserMidSysService extends IService { + +} diff --git a/Cpop-Mini/src/main/java/com/cpop/mini/business/service/impl/MiniUserMidSysServiceImpl.java b/Cpop-Mini/src/main/java/com/cpop/mini/business/service/impl/MiniUserMidSysServiceImpl.java new file mode 100644 index 0000000..454080b --- /dev/null +++ b/Cpop-Mini/src/main/java/com/cpop/mini/business/service/impl/MiniUserMidSysServiceImpl.java @@ -0,0 +1,18 @@ +package com.cpop.mini.business.service.impl; + +import com.cpop.mini.business.entity.MiniUserMidSys; +import com.cpop.mini.business.mapper.MiniUserMidSysMapper; +import com.cpop.mini.business.service.MiniUserMidSysService; +import com.mybatisflex.spring.service.impl.ServiceImpl; +import org.springframework.stereotype.Service; + +/** + * 小程序用户-系统用户中间表 服务层实现。 + * + * @author DB + * @since 2024-01-24 + */ +@Service("userMidSysService") +public class MiniUserMidSysServiceImpl extends ServiceImpl implements MiniUserMidSysService { + +} diff --git a/Cpop-Mini/src/main/resources/mapper/MiniUserMidSysMapper.xml b/Cpop-Mini/src/main/resources/mapper/MiniUserMidSysMapper.xml new file mode 100644 index 0000000..df0893f --- /dev/null +++ b/Cpop-Mini/src/main/resources/mapper/MiniUserMidSysMapper.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/Cpop-Oam/Cpop-Oam-Web/src/main/resources/application-prod.yml b/Cpop-Oam/Cpop-Oam-Web/src/main/resources/application-prod.yml index 41f8cf9..2f33f31 100644 --- a/Cpop-Oam/Cpop-Oam-Web/src/main/resources/application-prod.yml +++ b/Cpop-Oam/Cpop-Oam-Web/src/main/resources/application-prod.yml @@ -4,7 +4,7 @@ cpop: profile: /root/cpop-union/cpop-oam/upload jwt: #白名单 - whiteList: /websocket/*,/login,/backstage/wxOpen/**,/sysCommon/miniSyncBrandAndStore,/easyLearn/callback/*/*,/easyLearn/*,/mini/cardTemplate/*,/website/**,/backstage/wxCp/*,/callback/wxCp/*/registerCode,/callback/easyLearn/** + whiteList: /websocket/*,/login,/backstage/wxOpen/**,/sysCommon/miniSyncBrandAndStore,/easyLearn/callback/*/*,/easyLearn/*,/mini/cardTemplate/*,/website/**,/backstage/wxCp/*,/callback/wxCp/*/registerCode,/callback/easyLearn/**,/mini/sysCommon/miniSyncBrandAndStore #拦截 gateway: rsa-keypair: diff --git a/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/BusinessServiceImpl.java b/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/BusinessServiceImpl.java index 1634ac5..c943238 100644 --- a/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/BusinessServiceImpl.java +++ b/Cpop-Oam/src/main/java/com/cpop/oam/business/service/impl/BusinessServiceImpl.java @@ -5,6 +5,7 @@ import com.alibaba.excel.context.AnalysisContext; import com.alibaba.excel.read.listener.ReadListener; import com.alibaba.fastjson.JSONArray; import com.alibaba.fastjson.JSONObject; +import com.cpop.common.utils.DateUtils; import com.cpop.common.utils.StringUtils; import com.cpop.common.utils.bean.BeanUtils; import com.cpop.core.base.entity.PageDomain; @@ -45,6 +46,7 @@ import java.io.*; import java.net.URL; import java.time.LocalDate; import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; import java.util.ArrayList; import java.util.List; import java.util.concurrent.atomic.AtomicReference; @@ -380,6 +382,7 @@ public class BusinessServiceImpl extends ServiceImpl i .and(STORE.STORE_NAME.like(params) .or(STORE.PERSON_CHARGE.like(params) .or(STORE.PHONE.eq(params)))) + .and(STORE.CREATE_TIME.ge(LocalDate.parse("2023-12-01", DateTimeFormatter.ofPattern("yyyy-MM-dd")))) .orderBy(STORE.CREATE_TIME.desc()), BusinessUnSignPageVo.class); } @@ -400,6 +403,7 @@ public class BusinessServiceImpl extends ServiceImpl i storeSignService.save(storeSign); SpringUtils.getBean(StoreService.class).updateChain() .set(STORE.SIGN_ID,storeSign.getId()) + .set(STORE.HAVE_COUNSELOR,true) .where(STORE.ID.eq(id)) .update(); } diff --git a/Cpop-Pay/src/main/resources/application-pay.yml b/Cpop-Pay/src/main/resources/application-pay.yml index a8e1674..8332b6f 100644 --- a/Cpop-Pay/src/main/resources/application-pay.yml +++ b/Cpop-Pay/src/main/resources/application-pay.yml @@ -17,4 +17,4 @@ wx: service-app-id: wx1eb0e5fb7dac3c05 logging: level: - com.github.binarywang.wxpay: info \ No newline at end of file + com.github.binarywang.wxpay: debug \ No newline at end of file diff --git a/Cpop-System/src/main/java/com/cpop/system/business/controller/backstage/BackstageSysCommonController.java b/Cpop-System/src/main/java/com/cpop/system/business/controller/backstage/BackstageSysCommonController.java index ab2a911..917566d 100644 --- a/Cpop-System/src/main/java/com/cpop/system/business/controller/backstage/BackstageSysCommonController.java +++ b/Cpop-System/src/main/java/com/cpop/system/business/controller/backstage/BackstageSysCommonController.java @@ -89,18 +89,4 @@ public class BackstageSysCommonController { return R.ok(sysFileVo); } - /** - * 小程序同步品牌和校区 - * @author DB - * @since 2023/12/21 - * @param bo 请求参数 - * @return R - */ - @Deprecated - @ApiOperation("小程序同步品牌和校区") - @PostMapping("/miniSyncBrandAndStore") - public R miniSyncBrandAndStore(@RequestBody SyncBrandAndStoreBo bo) { - storeService.miniSyncBrandAndStore(bo); - return R.ok(); - } } diff --git a/Cpop-System/src/main/java/com/cpop/system/business/controller/mini/SysCommonController.java b/Cpop-System/src/main/java/com/cpop/system/business/controller/mini/SysCommonController.java new file mode 100644 index 0000000..620adf8 --- /dev/null +++ b/Cpop-System/src/main/java/com/cpop/system/business/controller/mini/SysCommonController.java @@ -0,0 +1,44 @@ +package com.cpop.system.business.controller.mini; + +import com.cpop.core.base.R; +import com.cpop.system.business.bo.SyncBrandAndStoreBo; +import com.cpop.system.business.service.StoreService; +import io.swagger.annotations.Api; +import io.swagger.annotations.ApiOperation; +import lombok.extern.slf4j.Slf4j; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +/** + * @author DB + * @createTime 2023/09/13 15:10 + * @description 通用接口 + */ +@Slf4j +@Api(tags = "通用接口") +@RestController +@RequestMapping("sysCommon") +@Deprecated +public class SysCommonController { + + @Autowired + private StoreService storeService; + + /** + * 小程序同步品牌和校区 + * @author DB + * @since 2023/12/21 + * @param bo 请求参数 + * @return R + */ + @Deprecated + @ApiOperation("小程序同步品牌和校区") + @PostMapping("/syncBrandAndStore") + public R miniSyncBrandAndStore(@RequestBody SyncBrandAndStoreBo bo) { + storeService.miniSyncBrandAndStore(bo); + return R.ok(); + } +}