云应用相关的业务代码

src/main/java/com/hwstudio/antaile/dto/LoginUserDto.java

@@ -14,6 +14,9 @@ import lombok.Data;
 @ApiModel
 public class LoginUserDto {
 
+
+    @ApiModelProperty(value = "用户id")
+    private Long userId;
     @ApiModelProperty(value="token")
     private String token;
 

src/main/java/com/hwstudio/antaile/mbg/mapper/AtlMenuMapper.java

+package com.hwstudio.antaile.mbg.mapper;
+
+import com.hwstudio.antaile.mbg.po.AtlMenu;
+import com.hwstudio.antaile.mbg.po.AtlMenuExample;
+import java.util.List;
+import org.apache.ibatis.annotations.Param;
+
+public interface AtlMenuMapper {
+    long countByExample(AtlMenuExample example);
+
+    int deleteByExample(AtlMenuExample example);
+
+    int deleteByPrimaryKey(Long id);
+
+    int insert(AtlMenu record);
+
+    int insertSelective(AtlMenu record);
+
+    List<AtlMenu> selectByExample(AtlMenuExample example);
+
+    AtlMenu selectByPrimaryKey(Long id);
+
+    int updateByExampleSelective(@Param("record") AtlMenu record, @Param("example") AtlMenuExample example);
+
+    int updateByExample(@Param("record") AtlMenu record, @Param("example") AtlMenuExample example);
+
+    int updateByPrimaryKeySelective(AtlMenu record);
+
+    int updateByPrimaryKey(AtlMenu record);
+}
\ No newline at end of file

src/main/java/com/hwstudio/antaile/mbg/po/AtlMenu.java

+package com.hwstudio.antaile.mbg.po;
+
+import io.swagger.annotations.ApiModelProperty;
+import java.io.Serializable;
+import java.util.Date;
+import javax.persistence.*;
+import org.springframework.format.annotation.DateTimeFormat;
+
+@Entity
+public class AtlMenu implements Serializable {
+    @ApiModelProperty(value = "主键")
+    @Id
+    @GeneratedValue(strategy= GenerationType.IDENTITY)
+    private Long id;
+
+    @ApiModelProperty(value = "菜单名称")
+    private String menuName;
+
+    @ApiModelProperty(value = "菜单入口url")
+    private String menuUrl;
+
+    @ApiModelProperty(value = "菜单外部url")
+    private String menuOtherUrl;
+
+    @ApiModelProperty(value = "菜单类型: 0展示端")
+    private Integer menuType;
+
+    @ApiModelProperty(value = "是否显示 0隐藏 1显示")
+    private Integer isShow;
+
+    @ApiModelProperty(value = "菜单排序：1最大 9999最小 顺序")
+    private Integer menuSort;
+
+    @ApiModelProperty(value = "数据标识 0无效 1有效")
+    private Integer dataFlag;
+
+    @ApiModelProperty(value = "是否默认菜单(0是|1否)")
+    private Integer defaultMenu;
+
+    @ApiModelProperty(value = "菜单所属应用")
+    private Long appId;
+
+    @ApiModelProperty(value = "删除标志(0|正常|1删除)")
+    private Integer isDelete;
+
+    @ApiModelProperty(value = "菜单备用字段")
+    private String menuMark;
+
+    @ApiModelProperty(value = "备注")
+    private String remark;
+
+    @ApiModelProperty(value = "创建时间")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date createTime;
+
+    @ApiModelProperty(value = "更新日期")
+    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+    private Date updateTime;
+
+    private static final long serialVersionUID = 1L;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getMenuName() {
+        return menuName;
+    }
+
+    public void setMenuName(String menuName) {
+        this.menuName = menuName;
+    }
+
+    public String getMenuUrl() {
+        return menuUrl;
+    }
+
+    public void setMenuUrl(String menuUrl) {
+        this.menuUrl = menuUrl;
+    }
+
+    public String getMenuOtherUrl() {
+        return menuOtherUrl;
+    }
+
+    public void setMenuOtherUrl(String menuOtherUrl) {
+        this.menuOtherUrl = menuOtherUrl;
+    }
+
+    public Integer getMenuType() {
+        return menuType;
+    }
+
+    public void setMenuType(Integer menuType) {
+        this.menuType = menuType;
+    }
+
+    public Integer getIsShow() {
+        return isShow;
+    }
+
+    public void setIsShow(Integer isShow) {
+        this.isShow = isShow;
+    }
+
+    public Integer getMenuSort() {
+        return menuSort;
+    }
+
+    public void setMenuSort(Integer menuSort) {
+        this.menuSort = menuSort;
+    }
+
+    public Integer getDataFlag() {
+        return dataFlag;
+    }
+
+    public void setDataFlag(Integer dataFlag) {
+        this.dataFlag = dataFlag;
+    }
+
+    public Integer getDefaultMenu() {
+        return defaultMenu;
+    }
+
+    public void setDefaultMenu(Integer defaultMenu) {
+        this.defaultMenu = defaultMenu;
+    }
+
+    public Long getAppId() {
+        return appId;
+    }
+
+    public void setAppId(Long appId) {
+        this.appId = appId;
+    }
+
+    public Integer getIsDelete() {
+        return isDelete;
+    }
+
+    public void setIsDelete(Integer isDelete) {
+        this.isDelete = isDelete;
+    }
+
+    public String getMenuMark() {
+        return menuMark;
+    }
+
+    public void setMenuMark(String menuMark) {
+        this.menuMark = menuMark;
+    }
+
+    public String getRemark() {
+        return remark;
+    }
+
+    public void setRemark(String remark) {
+        this.remark = remark;
+    }
+
+    public Date getCreateTime() {
+        return createTime;
+    }
+
+    public void setCreateTime(Date createTime) {
+        this.createTime = createTime;
+    }
+
+    public Date getUpdateTime() {
+        return updateTime;
+    }
+
+    public void setUpdateTime(Date updateTime) {
+        this.updateTime = updateTime;
+    }
+
+    @Override
+    public String toString() {
+        StringBuilder sb = new StringBuilder();
+        sb.append(getClass().getSimpleName());
+        sb.append(" [");
+        sb.append("Hash = ").append(hashCode());
+        sb.append(", id=").append(id);
+        sb.append(", menuName=").append(menuName);
+        sb.append(", menuUrl=").append(menuUrl);
+        sb.append(", menuOtherUrl=").append(menuOtherUrl);
+        sb.append(", menuType=").append(menuType);
+        sb.append(", isShow=").append(isShow);
+        sb.append(", menuSort=").append(menuSort);
+        sb.append(", dataFlag=").append(dataFlag);
+        sb.append(", defaultMenu=").append(defaultMenu);
+        sb.append(", appId=").append(appId);
+        sb.append(", isDelete=").append(isDelete);
+        sb.append(", menuMark=").append(menuMark);
+        sb.append(", remark=").append(remark);
+        sb.append(", createTime=").append(createTime);
+        sb.append(", updateTime=").append(updateTime);
+        sb.append(", serialVersionUID=").append(serialVersionUID);
+        sb.append("]");
+        return sb.toString();
+    }
+}
\ No newline at end of file

src/main/java/com/hwstudio/antaile/service/AtlAppAliossService.java

@@ -13,6 +13,7 @@ import com.hwstudio.antaile.mbg.po.AtlAppAliossExample;
 import com.hwstudio.antaile.mbg.po.AtlAppstoreOrder;
 import com.hwstudio.antaile.queryparam.QueryAliossAndOrderParam;
 import com.hwstudio.antaile.utils.JsonResult;
+import org.junit.Test;
 import org.springframework.stereotype.Service;
 
 import javax.annotation.Resource;

src/main/java/com/hwstudio/antaile/service/AtlAppStoreOrderService.java

@@ -7,6 +7,7 @@ import com.hwstudio.antaile.common.BeanUtils;
 import com.hwstudio.antaile.common.Constants;
 import com.hwstudio.antaile.dto.AtlAppstoreOrderDTO;
 import com.hwstudio.antaile.mapper.AtlAppstoreOrderDao;
+import com.hwstudio.antaile.mbg.mapper.AtlAppstoreMapper;
 import com.hwstudio.antaile.mbg.mapper.AtlAppstoreOrderMapper;
 import com.hwstudio.antaile.mbg.po.AtlAppstore;
 import com.hwstudio.antaile.mbg.po.AtlAppstoreOrder;
@@ -39,7 +40,8 @@ public class AtlAppStoreOrderService {
     private AtlAppstoreOrderDao atlAppstoreOrderDao;
     @Autowired
     private AtlAppStoreService atlAppStoreService;
-
+    @Resource
+    private AtlAppstoreMapper atlAppstoreMapper;
 
     /**
      * 根据应用订单id修改一条订单数据
@@ -94,6 +96,8 @@ public class AtlAppStoreOrderService {
         if (res.getStatus().equals(Constants.RESPONSE_STATUS_500)) {
             return res;
         }
+        //查询应用信息数据
+        AtlAppstore atlAppstore = this.atlAppStoreService.selectOneByAppId(insertAppstoreOrderParam.getAppId());
         AtlAppstoreOrder atlAppstoreOrder = new AtlAppstoreOrder();
         BeanUtils.copyProperties(insertAppstoreOrderParam, atlAppstoreOrder);
         //插入 生成订单号
@@ -102,6 +106,9 @@ public class AtlAppStoreOrderService {
         if (insertAppstoreOrderParam.getPayType().equals(0)) {
             atlAppstoreOrder.setPayTime(new Date());
             atlAppstoreOrder.setIsPay(0);
+            //增加应用销量
+            atlAppstore.setSaleNum(atlAppstore.getSaleNum() + 1);
+            this.atlAppstoreMapper.updateByPrimaryKeySelective(atlAppstore);
         }
         this.atlAppstoreOrderMapper.insertSelective(atlAppstoreOrder);
         //判断是否菜单  如果是菜单还需要将其加入到  时光纪菜单相关信息数据

src/main/java/com/hwstudio/antaile/service/AtlWxService.java

@@ -117,7 +117,13 @@ public class AtlWxService {
             return JsonResult.failed("获取accessToken失败：", dataMap);
         }
         //返回了openid等信息 根据openid去查询 如果没有则去新增
-        AtlUser atlUser = atlUserMapper.getByWebappOpenId(openid);
+        AtlUser atlUser = null;
+        if (type.equals(1)) {
+            atlUser = atlUserMapper.getByWebappOpenId(openid);
+        } else {
+            atlUser= atlUserMapper.getByOfficeOpenId(openid);
+        }
+
         //如果是新用户  需要去绑定手机号 和 密码
         if (atlUser == null) {
             String msg = "";
@@ -137,6 +143,7 @@ public class AtlWxService {
             loginUserDto.setNickName(atlUser.getNickName());
             loginUserDto.setPhone(atlUser.getMobilePhone());
             loginUserDto.setWebappOpenId(atlUser.getOpenId());
+            loginUserDto.setUserId(atlUser.getId());
             return JsonResult.success("登录成功", loginUserDto);
         }
         //{"success":true,"status":"200","message":"获取微信登录链接成功","data":"{\"openid\":\"onUQk6gm0ALTXFtddQrikfhmivR0\",\"nickname\":\"夏侯\",\"sex\":1,\"language\":\"zh_CN\",\"city\":\"Xiamen\",\"province\":\"Fujian\",\"country\":\"CN\",
@@ -209,6 +216,7 @@ public class AtlWxService {
         loginUserDto.setNickName(insertAtlUser.getNickName());
         loginUserDto.setPhone(insertAtlUser.getMobilePhone());
         loginUserDto.setWebappOpenId(insertAtlUser.getOpenId());
+        loginUserDto.setUserId(insertAtlUser.getId());
         return JsonResult.success("绑定手机号登录成功", loginUserDto);
     }
 

src/main/java/com/hwstudio/antaile/vo/AtlTimeVo.java

@@ -83,4 +83,6 @@ public class AtlTimeVo {
     private Long blessId;
     @ApiModelProperty(value = "关联的福位格ID（ERP库osh_user_bless_using表bless_idx字段）")
     private Integer blessIdx;
+    @ApiModelProperty(value = "oss配置时光纪相关的路径")
+    private String ossCatalogue;
 }

src/main/resources/mapping/AtlTimeMapper.xml

@@ -62,6 +62,9 @@
     <if test="blessIdx != null">
       ,bless_idx
     </if>
+    <if test="ossCatalogue != null and ossCatalogue != ''">
+      ,oss_catalogue
+    </if>
     )
     VALUES(#{userId}, #{templateId}, #{name}, #{aboutName}, #{privacySetting}, #{coverUrl}, #{isDefault}, #{readCount}, #{likeCount}, NOW(), NOW()
     <if test="blessId != null">
@@ -70,6 +73,9 @@
     <if test="blessIdx != null">
       ,#{blessIdx}
     </if>
+    <if test="ossCatalogue != null and ossCatalogue != ''">
+      ,#{ossCatalogue}
+    </if>
     )
   </insert>