Merge remote-tracking branch 'origin/dev-chw' into dev-chw

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/OrderWaterDTO.java

@@ -41,6 +41,21 @@ public class OrderWaterDTO {
     private Integer status;
 
 
+    @ApiModelProperty(value = "店铺id")
+    private Integer companyId;
+
+
+    @ApiModelProperty(value = "分账id(不用传)")
+    private Integer acceptId;
+
+
+    @ApiModelProperty(value = "正分账id(不用传)")
+    private Integer zAcceptId;
+
+    @ApiModelProperty(value = "分账金额")
+    private BigDecimal orderAmount;
+
+
     @ApiModelProperty(value = "订单商品")
     private List<OrderGoodsDTO> goodsDTOList;
 

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/AppUserSellingWater.java

@@ -41,6 +41,11 @@ public class AppUserSellingWater implements Serializable {
     @Column(name = "position_id")
 	@ApiModelProperty(value = "身份职位")
     private Integer positionId;
+
+
+	@Column(name = "accept_id")
+	@ApiModelProperty(value = "分账id")
+	private Integer acceptId;
 	
 	    /**
      *  来源用户id

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/BaseCommissionRatio.java

@@ -35,7 +35,7 @@ public class BaseCommissionRatio implements Serializable {
 
     @Column(name = "extract")
 	@ApiModelProperty(value = "拥金比例")
-    private BigDecimal extract;
+    private Integer extract;
 
 
 	@Column(name = "content")

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/BaseOrderAcceptDetailed.java

+package com.github.wxiaoqi.security.admin.entity;
+
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+
+/**
+ * 订单分账表
+ * 
+ * @author hezhen
+ * @email 18178966185@163.com
+ * @date 2020-03-03 13:13:34
+ */
+@Data
+@Table(name = "base_order_accept_detailed")
+public class BaseOrderAcceptDetailed implements Serializable {
+	private static final long serialVersionUID = 1L;
+	
+
+    @Id
+	@GeneratedValue(generator = "JDBC")
+	@ApiModelProperty("主键id")
+    private Integer id;
+	
+
+
+    @Column(name = "mch_id")
+	@ApiModelProperty(value = "分账账号")
+    private Integer mchId;
+	
+
+    @Column(name = "order_no")
+	@ApiModelProperty(value = "分账订单")
+	private String orderNo;
+
+
+	@Column(name = "order_id")
+	@ApiModelProperty(value = "订单id")
+	private Integer orderId;
+
+
+	@Column(name = "user_id")
+	@ApiModelProperty(value = "来源用户id")
+	private Integer userId;
+
+
+
+	@Column(name = "division_type")
+	@ApiModelProperty(value = "类型 1=>平台抽成；2-上级用户拥金；3-上级商家拥金；4-推荐入驻拥金")
+	private Integer divisionType;
+
+
+
+	@Column(name = "division_amount")
+	@ApiModelProperty(value = "分账金额")
+	private BigDecimal divisionAmount;
+
+
+	@Column(name = "fee")
+	@ApiModelProperty(value = "手续费")
+	private BigDecimal fee;
+
+
+
+	@Column(name = "order_amount")
+	@ApiModelProperty(value = "订单金额")
+	private BigDecimal orderAmount;
+
+
+	@Column(name = "status")
+	@ApiModelProperty(value = "是否入账:0-未结算；1-已结算")
+	private Integer status;
+
+
+
+	@Column(name = "extract")
+	@ApiModelProperty(value = "抽成比例")
+	private Integer extract;
+
+
+
+	@Column(name = "type")
+	@ApiModelProperty(value = "类型：1-转入；2-退款")
+	private Integer type;
+
+
+
+	@Column(name = "add_time")
+	@ApiModelProperty(value = "下单时间")
+	private Long addTime;
+
+
+	@Column(name = "status_time")
+	@ApiModelProperty(value = "结算时间")
+	private Long statusTime;
+
+
+}

ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/entity/MyWalletDetail.java

@@ -104,7 +104,7 @@ public class MyWalletDetail implements Serializable {
      */
     @Column(name = "crt_user")
 	@ApiModelProperty(value = "操作者ID(如果系统操作,-1)")
-    private Integer crtUser;
+    private String crtUser;
 	
 	    /**
      *  操作时间

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/BaseCommissionRatioBiz.java

 package com.github.wxiaoqi.security.admin.biz;
 
 import com.github.wxiaoqi.security.admin.entity.BaseCommissionRatio;
-import com.github.wxiaoqi.security.admin.entity.BaseGoodCommission;
 import com.github.wxiaoqi.security.admin.mapper.BaseCommissionRatioMapper;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import org.springframework.stereotype.Service;
 import tk.mybatis.mapper.entity.Example;
-
-import java.math.BigDecimal;
 import java.util.List;
 
 /**
@@ -22,14 +19,11 @@ public class BaseCommissionRatioBiz extends BaseBiz<BaseCommissionRatioMapper, B
 
 
 
-    public BigDecimal getExtract(Integer type){
-        Example example=new Example(BaseGoodCommission.class);
-        example.createCriteria().andEqualTo("type", type).andEqualTo("status",1);
-        List<BaseCommissionRatio> list = mapper.selectByExample(example);
-        if (list != null && list.size() != 0) {
-            return list.get(0).getExtract();
-        }
-      return  BigDecimal.ZERO;
+
+    public List<BaseCommissionRatio> getList(){
+        Example example=new Example(BaseCommissionRatio.class);
+        example.createCriteria().andEqualTo("status",1);
+        return  mapper.selectByExample(example);
     }
 
 }
\ No newline at end of file

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/MyWaterBiz.java

@@ -201,4 +201,5 @@ public class MyWaterBiz extends BaseBiz<MyWalletMapper, MyWallet>{
         }
 
     }
+
 }
\ No newline at end of file

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/handler/WaterMQHandler.java

@@ -5,6 +5,7 @@ import cn.hutool.db.sql.Order;
 import cn.hutool.json.JSONUtil;
 import com.alibaba.fastjson.JSONObject;
 import com.github.wxiaoqi.security.admin.biz.AppUserSellingWaterBiz;
+import com.github.wxiaoqi.security.admin.biz.BaseOrderAcceptDetailedBiz;
 import com.github.wxiaoqi.security.admin.dto.OrderGoodsDTO;
 import com.github.wxiaoqi.security.admin.dto.OrderWaterDTO;
 import com.rabbitmq.client.Channel;
@@ -36,6 +37,9 @@ public class WaterMQHandler {
     @Autowired
     AppUserSellingWaterBiz waterBiz;
 
+    @Autowired
+    BaseOrderAcceptDetailedBiz acceptDetailedBiz;
+
     /**
      * 佣金
      * @param
@@ -128,7 +132,7 @@ public class WaterMQHandler {
                             break;
                     }
 
-                    waterBiz.orderWater(orderWaterDTO);
+                    acceptDetailedBiz.orderWater(orderWaterDTO);
 
                     executorService.shutdown();
                     Long deliveryTag = (Long) headers.get(AmqpHeaders.DELIVERY_TAG);

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/mapper/AppUserSellingWaterMapper.java

@@ -33,4 +33,5 @@ public interface AppUserSellingWaterMapper extends Mapper<AppUserSellingWater> {
     List<AppUserSellingWaterDTO> statisticsStatffSellerWaterByUserIdsAndTime(@Param("userIds") List<Integer> userIds,
                                                                              @Param("startTime") Long startTime,
                                                                              @Param("endTime") Long endTime);
+    List<AppUserSellingWater> getCommisionByOrder(@Param("orderId") Integer orderId);
 }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/mapper/BaseOrderAcceptDetailedMapper.java

+package com.github.wxiaoqi.security.admin.mapper;
+
+import com.github.wxiaoqi.security.admin.entity.BaseOrderAcceptDetailed;
+import tk.mybatis.mapper.common.Mapper;
+
+/**
+ * 订单分账表
+ * 
+ * @author zjw
+ * @email 18178966185@163.com
+ * @date 2019-07-11 14:14:54
+ */
+public interface BaseOrderAcceptDetailedMapper extends Mapper<BaseOrderAcceptDetailed> {
+
+}

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/admin/AdminBaseOrderAcceptDetailedController.java

+package com.github.wxiaoqi.security.admin.rest.admin;
+
+import com.github.wxiaoqi.security.admin.biz.BaseOrderAcceptDetailedBiz;
+import com.github.wxiaoqi.security.admin.dto.OrderWaterDTO;
+import com.github.wxiaoqi.security.admin.entity.BaseOrderAcceptDetailed;
+import com.github.wxiaoqi.security.admin.feign.UserFeign;
+import com.github.wxiaoqi.security.admin.feign.rest.UserRestInterface;
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.rest.BaseController;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+/**
+ * @author Administrator
+ */
+@Slf4j
+@RestController
+@RequestMapping("backstage/accept")
+@Api(tags = {"拥金比例"})
+public class AdminBaseOrderAcceptDetailedController extends BaseController<BaseOrderAcceptDetailedBiz, BaseOrderAcceptDetailed> implements UserRestInterface {
+
+
+    @Autowired
+    UserFeign userFeign;
+
+
+    @Override
+    public UserFeign getUserFeign() {
+        return userFeign;
+    }
+
+
+
+
+    @PostMapping("orderWater")
+    @ApiModelProperty("设置")
+    public  ObjectRestResponse orderWater(@RequestBody OrderWaterDTO orderWaterDTO) {
+       baseBiz.orderWater(orderWaterDTO);
+       return ObjectRestResponse.succ();
+    }
+
+
+
+}

ace-modules/ace-admin/src/main/resources/mapper/AppUserSellingWaterMapper.xml

@@ -175,4 +175,18 @@ FROM
         </if> group by user_id) AS `auswd`
         on auswd.user_id=auswu.user_id
     </select>
+
+    <select id="getCommisionByOrder" resultType="com.github.wxiaoqi.security.admin.entity.AppUserSellingWater">
+        SELECT
+        r.user_id as userId,
+        SUM(r.zCommission)-SUM(r.fCommission) as commission,
+        SUM(r.zCommission) as price
+        FROM
+        (
+        SELECT user_id,commission as zCommission,0 as fCommission,price FROM app_user_selling_water WHERE order_id = #{orderId} and `status`= 0 and waiting = 1
+        UNION ALL
+        SELECT user_id,0 as zCommission,commission as fCommission,price  FROM app_user_selling_water WHERE order_id = #{orderId} and `status`= 1 and waiting = 1
+        ) r
+        GROUP BY r.user_id
+    </select>
 </mapper>
\ No newline at end of file

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/dto/ActivityDTO.java

+package com.xxfc.platform.activity.dto;
+
+import com.github.wxiaoqi.security.common.vo.PageParam;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.util.Date;
+
+/**
+ * @author libin
+ * @version 1.0
+ * @description
+ * @data 2019/12/3 18:56
+ */
+@Data
+@Builder(toBuilder = true)
+@AllArgsConstructor
+@NoArgsConstructor
+public class ActivityDTO extends PageParam {
+
+     private Date startTime;
+     private Date endTime;
+     private Integer goodsType;
+
+}

xx-activity/xx-activity-api/src/main/java/com/xxfc/platform/activity/vo/ActivityVo.java

+package com.xxfc.platform.activity.vo;
+
+import com.xxfc.platform.activity.entity.Activity;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import java.io.Serializable;
+import java.math.BigDecimal;
+
+
+/**
+ * 峰会活动表
+ * 
+ * @author wuweizhi
+ * @email 18178966185@163.com
+ * @date 2020-10-08 09:48:35
+ */
+@Data
+public class ActivityVo extends Activity {
+
+}

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/ActivityBiz.java

 package com.xxfc.platform.activity.biz;
 
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.util.Query;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
+import com.xxfc.platform.activity.dto.ActivityDTO;
+import com.xxfc.platform.activity.dto.ActivityLuckDrawFindDTO;
+import com.xxfc.platform.activity.vo.ActivityLuckyDrawListVo;
+import com.xxfc.platform.activity.vo.ActivityVo;
 import org.springframework.stereotype.Service;
 
 import com.xxfc.platform.activity.entity.Activity;
@@ -15,4 +22,14 @@ import com.github.wxiaoqi.security.common.biz.BaseBiz;
  */
 @Service
 public class ActivityBiz extends BaseBiz<ActivityMapper, Activity> {
+
+    public ObjectRestResponse<PageDataVO<ActivityVo>> getAllByPage(ActivityDTO activityDTO) {
+        Integer page = activityDTO.getPage() == null ? 1 : activityDTO.getPage();
+        Integer limit = activityDTO.getLimit() == null ? 10 : activityDTO.getLimit();
+        activityDTO.setPage(page);
+        activityDTO.setLimit(limit);
+        Query query = new Query(activityDTO);
+        PageDataVO<ActivityVo> pageDataVO = PageDataVO.pageInfo(query, () -> mapper.getAllByPage(query.getSuper()));
+        return ObjectRestResponse.succ(pageDataVO);
+    }
 }
\ No newline at end of file

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/mapper/ActivityMapper.java

 package com.xxfc.platform.activity.mapper;
 
 import com.xxfc.platform.activity.entity.Activity;
+import com.xxfc.platform.activity.vo.ActivityLuckyDrawListVo;
+import com.xxfc.platform.activity.vo.ActivityVo;
 import tk.mybatis.mapper.common.Mapper;
 
+import java.util.List;
+import java.util.Map;
+
 /**
  * 峰会活动表
  * 
@@ -11,5 +16,5 @@ import tk.mybatis.mapper.common.Mapper;
  * @date 2020-10-08 09:48:35
  */
 public interface ActivityMapper extends Mapper<Activity> {
-	
+    List<ActivityVo> getAllByPage(Map<String, Object> param);
 }

xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/rest/admin/ActivityAdminController.java

+package com.xxfc.platform.activity.rest.admin;
+
+import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
+import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
+import com.xxfc.platform.activity.biz.ActivityBiz;
+import com.xxfc.platform.activity.dto.ActivityDTO;
+import com.xxfc.platform.activity.dto.ActivityLuckDrawFindDTO;
+import com.xxfc.platform.activity.entity.Activity;
+import com.xxfc.platform.activity.vo.ActivityLuckyDrawListVo;
+import com.xxfc.platform.activity.vo.ActivityVo;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("admin/activity")
+public class ActivityAdminController extends BaseController<ActivityBiz, Activity> {
+
+    /**
+     * 活动列表
+     *
+     * @param activityDTO
+     * @return
+     */
+    @PostMapping("/page")
+    @ResponseBody
+    public ObjectRestResponse<PageDataVO<ActivityVo>> listActivtyLuckyDrawWithPage(@RequestBody ActivityDTO activityDTO) {
+        return baseBiz.getAllByPage(activityDTO);
+    }
+}
\ No newline at end of file

xx-activity/xx-activity-server/src/main/resources/mapper/ActivityMapper.xml

@@ -30,4 +30,24 @@
         <result property="isDel" column="is_del"/>
     </resultMap>
 
+    <select id="getAllByPage" resultType="com.xxfc.platform.activity.vo.ActivityVo" parameterType="Map">
+        select * from `activity` where 1=1
+        <if test="goodsType != null">
+            and `goods_type`=#{goodsType}
+        </if>
+        <if test="startTime != null and endTime != null">
+            and `crt_time` between #{startTime} and #{endTime}
+        </if>
+        <if test="startTime != null and endTime == null">
+            and <![CDATA[
+            `crt_time` >= #{startTime}
+            ]]>
+        </if>
+        <if test="startTime==null and endTime!=null">
+            and <![CDATA[
+            `crt_time`<=#{endTime}
+            ]]>
+        </if>
+        order by `crt_time` desc
+    </select>
 </mapper>
\ No newline at end of file

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/AppVehicleController.java

@@ -52,6 +52,12 @@ public class AppVehicleController extends BaseController<VehicleBiz> {
         return  ObjectRestResponse.succ(baseBiz.info(vehicleFindDTO));
     }
 
+    @GetMapping("detail/{id}")
+    @ApiModelProperty("商品详情")
+    public  ObjectRestResponse detail(@PathVariable("id") String id ) {
+        return  ObjectRestResponse.succ(baseBiz.selectById(id));
+    }
+