更新

yiqi-admin/pom.xml

@@ -87,10 +87,10 @@
             <artifactId>yiqi-generator</artifactId>
         </dependency>
 
-        <dependency>
-            <groupId>com.yiqi</groupId>
-            <artifactId>yiqi-crm</artifactId>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>com.yiqi</groupId>-->
+<!--            <artifactId>yiqi-crm</artifactId>-->
+<!--        </dependency>-->
 
         <dependency>
             <groupId>com.yiqi</groupId>

yiqi-admin/src/main/java/com/yiqi/YiQiWebApplication.java

@@ -15,7 +15,7 @@ import org.springframework.scheduling.annotation.EnableScheduling;
  * @author ruoyi
  */
 @EnableMPP
-@EntityScan("com.yiqi.*.domain")
+@EntityScan("com.yiqi.**.domain")
 @ServletComponentScan
 @MapperScan("com.yiqi.**.mapper")
 @EnableScheduling

yiqi-admin/src/main/java/com/yiqi/web/controller/system/SysDataGroupController.java

@@ -96,7 +96,7 @@ public class SysDataGroupController extends BaseController {
     @ApiOperation(value = "获取组合数据头信息")
     public AjaxResult getHeaderInfo(Integer gid) {
         SysDataGroup sysDataGroup = sysDataGroupService.selectSysDataGroupById(gid);
-        List<DataGroupFiled> dataGroupFileds = JSONUtil.toList(sysDataGroup.getFields(), DataGroupFiled.class);
+        List<DataGroupFiled> dataGroupFileds = JSONUtil.toList(JSONUtil.parseArray(sysDataGroup.getFields()), DataGroupFiled.class);
         DataGroupHeader id = DataGroupHeader.createIdHeader();
         DataGroupHeader status = DataGroupHeader.createStatusHeader();
         DataGroupHeader action = DataGroupHeader.createActionHeader();
@@ -125,7 +125,7 @@ public class SysDataGroupController extends BaseController {
         SysDataGroup sysDataGroup = sysDataGroupService.selectSysDataGroupById(gid);
         startPage();
         List<SysDataGroupInfo> list = sysDataGroupInfoService.getDataList(gid, status);
-        List<DataGroupFiled> dataGroupFileds = JSONUtil.toList(sysDataGroup.getFields(), DataGroupFiled.class);
+        List<DataGroupFiled> dataGroupFileds = JSONUtil.toList(JSONUtil.parseArray(sysDataGroup.getFields()), DataGroupFiled.class);
         Map<String, DataGroupRules> rulesMap = new HashMap<>();
         for (DataGroupFiled dataGroupFiled : dataGroupFileds) {
             DataGroupRules dataGroupHeader = DataGroupRules.create(dataGroupFiled.getType(), dataGroupFiled.getTitle(), dataGroupFiled.getName(), dataGroupFiled.getParam(), null);
@@ -260,7 +260,7 @@ public class SysDataGroupController extends BaseController {
     @ApiOperation(value = "创建数据表单")
     public AjaxResult createForm(Integer gid) {
         SysDataGroup sysDataGroup = sysDataGroupService.selectSysDataGroupById(gid);
-        List<DataGroupFiled> dataGroupFileds = JSONUtil.toList(sysDataGroup.getFields(), DataGroupFiled.class);
+        List<DataGroupFiled> dataGroupFileds = JSONUtil.toList(JSONUtil.parseArray(sysDataGroup.getFields()), DataGroupFiled.class);
         Map map = new HashMap();
         map.put("title", "添加数据");
         map.put("status", true);
@@ -290,7 +290,7 @@ public class SysDataGroupController extends BaseController {
     public AjaxResult editForm(Integer id) {
         SysDataGroupInfo sysDataGroupInfo = sysDataGroupInfoService.getById(id);
         SysDataGroup sysDataGroup = sysDataGroupService.selectSysDataGroupById(sysDataGroupInfo.getGid());
-        List<DataGroupFiled> dataGroupFileds = JSONUtil.toList(sysDataGroup.getFields(), DataGroupFiled.class);
+        List<DataGroupFiled> dataGroupFileds = JSONUtil.toList(JSONUtil.parseArray(sysDataGroup.getFields()), DataGroupFiled.class);
         Map map = new HashMap();
         map.put("title", "添加数据");
         map.put("status", true);

yiqi-api/pom.xml

@@ -20,12 +20,20 @@
 
     <dependencies>
 
+        <!-- 开启热部署 -->
+        <!--        <dependency>-->
+        <!--            <groupId>org.springframework.boot</groupId>-->
+        <!--            <artifactId>spring-boot-devtools</artifactId>-->
+        <!--            <scope>runtime</scope>-->
+        <!--            <optional>true</optional>-->
+        <!--        </dependency>-->
+
         <!-- spring-boot-devtools -->
-<!--        <dependency>-->
-<!--            <groupId>org.springframework.boot</groupId>-->
-<!--            <artifactId>spring-boot-devtools</artifactId>-->
-<!--            <optional>true</optional> &lt;!&ndash; 表示依赖不会传递 &ndash;&gt;-->
-<!--        </dependency>-->
+        <!--        <dependency>-->
+        <!--            <groupId>org.springframework.boot</groupId>-->
+        <!--            <artifactId>spring-boot-devtools</artifactId>-->
+        <!--            <optional>true</optional> &lt;!&ndash; 表示依赖不会传递 &ndash;&gt;-->
+        <!--        </dependency>-->
 
         <dependency>
             <groupId>com.alibaba</groupId>
@@ -33,6 +41,31 @@
             <version>1.2.78</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.jeecgframework.jimureport</groupId>
+            <artifactId>jimureport-spring-boot-starter</artifactId>
+            <version>1.9.0</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.jeecgframework.jimureport</groupId>
+            <artifactId>jimureport-dashboard-spring-boot-starter</artifactId>
+            <version>1.9.0</version>
+        </dependency>
+
+        <!--        &lt;!&ndash; swagger3&ndash;&gt;-->
+        <!--        <dependency>-->
+        <!--            <groupId>io.springfox</groupId>-->
+        <!--            <artifactId>springfox-boot-starter</artifactId>-->
+        <!--        </dependency>-->
+
+        <!--        &lt;!&ndash; 防止进入swagger页面报类型转换错误，排除3.0.0中的引用，手动增加1.6.2版本 &ndash;&gt;-->
+        <!--        <dependency>-->
+        <!--            <groupId>io.swagger</groupId>-->
+        <!--            <artifactId>swagger-models</artifactId>-->
+        <!--            <version>1.6.2</version>-->
+        <!--        </dependency>-->
+
         <!-- Mysql驱动包 -->
         <dependency>
             <groupId>mysql</groupId>
@@ -45,15 +78,31 @@
             <artifactId>yiqi-framework</artifactId>
         </dependency>
 
+        <!-- 定时任务-->
+        <dependency>
+            <groupId>com.yiqi</groupId>
+            <artifactId>yiqi-quartz</artifactId>
+        </dependency>
+
+        <!-- 代码生成-->
+        <dependency>
+            <groupId>com.yiqi</groupId>
+            <artifactId>yiqi-generator</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>com.yiqi</groupId>
+            <artifactId>yiqi-crm</artifactId>
+        </dependency>
+
         <dependency>
             <groupId>com.yiqi</groupId>
             <artifactId>yiqi-core</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>com.qcloud</groupId>
-            <artifactId>cos_api</artifactId>
-            <version>5.6.89</version>
+            <groupId>com.yiqi</groupId>
+            <artifactId>yiqi-quartz</artifactId>
         </dependency>
 
     </dependencies>

yiqi-api/src/main/java/com/yiqi/api/controller/ServerController.java

@@ -0,0 +1,25 @@
+package com.yiqi.api.controller;
+
+import com.yiqi.common.core.domain.AjaxResult;
+import com.yiqi.framework.web.domain.Server;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+/**
+ * 服务器监控
+ *
+ * @author ruoyi
+ */
+@RestController
+@RequestMapping("/monitor/server")
+public class ServerController {
+    @PreAuthorize("@ss.hasPermi('monitor:server:list')")
+    @GetMapping()
+    public AjaxResult getInfo() throws Exception {
+        Server server = new Server();
+        server.copyTo();
+        return AjaxResult.success(server);
+    }
+}

yiqi-common/src/main/java/com/yiqi/common/enums/PayType.java

@@ -11,11 +11,8 @@ public enum PayType implements CodeEnum
     ALIPAY("1", "ALIPAY"),
     CASH("2", "现金"),
     BALANCE("3", "会员余额"),
-
-    RECHARGE_CARD("4", "储值卡"),
-
-    OFFLINE("5", "线下支付"),
-    UNIONPAY("6", "银联支付"),
+    UNIONPAY("4", "银联支付"),
+    RECHARGE_CARD("5", "储值卡"),
     //组合支付
     COMBINE("9", "组合支付"),
     ;

yiqi-common/src/main/java/com/yiqi/order/domain/OrderRecharge.java

@@ -127,7 +127,7 @@ public class OrderRecharge extends BaseEntity {
     /**
      * 支付方式（0=微信，1=支付宝，2=现金，3=充值卡）
      */
-    @Excel(name = "支付方式", readConverterExp = "0==微信，1=支付宝，2=现金，3=充值卡")
+    @Excel(name = "支付方式", readConverterExp = "0=微信，1=支付宝，2=现金，3=充值卡")
     @ApiModelProperty("支付方式（0=微信，1=支付宝，2=现金，3=充值卡）")
     private String payType;
 

yiqi-core/src/main/java/com/yiqi/core/service/impl/SettlementManageBillServiceImpl.java

@@ -140,6 +140,7 @@ public class SettlementManageBillServiceImpl extends ServiceImpl<SettlementManag
 
     @Override
     public StoreBillStatistics storeChargeSettlement(Long storeId, Date startTime, Date endTime) {
+
         return null;
     }
 

yiqi-core/src/main/java/com/yiqi/order/service/impl/OrderRechargeServiceImpl.java

@@ -1197,9 +1197,6 @@ public class OrderRechargeServiceImpl extends ServiceImpl<OrderRechargeMapper, O
             case RECHARGE_CARD:
                 refundOrder.setCashRefundAmount(card.getRechargeBalance());
                 break;
-            case OFFLINE:
-                refundOrder.setCashRefundAmount(card.getRechargeBalance());
-                break;
         }
     }