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

src/main/java/com/huiju/estateagents/center/taUser/controller/TaUserAuthButtonController.java

@@ -36,7 +36,7 @@ public class TaUserAuthButtonController extends BaseController {
                                           @RequestParam("pageNum")Integer pageNum,
                                           @RequestParam("pageSize")Integer pageSize){
         Integer userId = getUserId(servletRequest);
-        return iTaUserAuthButtonService.getButtonByUserId(pageNum,pageSize,userId.toString());
+        return iTaUserAuthButtonService.getButtonByUserId(pageNum,pageSize,userId.toString(),getOrgId(servletRequest));
     }
 
 

src/main/java/com/huiju/estateagents/center/taUser/controller/TaUserController.java

@@ -287,7 +287,7 @@ public class TaUserController extends BaseController {
             TaUser taUser = iTaUserService.getById(map.get("userId").toString());
             List<TaRole> roles = iTaRoleService.getRolesByUser(taUser.getUserId());
             ResponseBean authMenu = iTaUserAuthMenuService.getMenuByUserId(null, null, taUser.getUserId().toString(),taUser.getOrgId());
-            ResponseBean authButton = iTaUserAuthButtonService.getButtonByUserId(null, null, taUser.getUserId().toString());
+            ResponseBean authButton = iTaUserAuthButtonService.getButtonByUserId(null, null, taUser.getUserId().toString(),taUser.getOrgId());
             QueryWrapper<TaMiniapp> taMiniappQueryWrapper = new QueryWrapper<>();
             taMiniappQueryWrapper.eq("org_id", getOrgId(request));
             TaMiniapp taMiniapp = iTaMiniappService.getOne(taMiniappQueryWrapper);

src/main/java/com/huiju/estateagents/center/taUser/service/ITaUserAuthButtonService.java

@@ -14,7 +14,7 @@ import java.util.List;
  */
 public interface ITaUserAuthButtonService extends IService<SysButtonInMenu> {
 
-    ResponseBean getButtonByUserId(Integer pageNum, Integer pageSize, String userId);
+    ResponseBean getButtonByUserId(Integer pageNum, Integer pageSize, String userId, Integer orgId);
 
     ResponseBean getAllButton(Integer pageNum, Integer pageSize);
 

src/main/java/com/huiju/estateagents/center/taUser/service/impl/TaUserAuthButtonServiceImpl.java

@@ -9,10 +9,15 @@ import com.huiju.estateagents.center.taUser.entity.TaUser;
 import com.huiju.estateagents.center.taUser.mapper.TaUserAuthButtonMapper;
 import com.huiju.estateagents.center.taUser.mapper.TaUserMapper;
 import com.huiju.estateagents.center.taUser.service.ITaUserAuthButtonService;
+import com.huiju.estateagents.common.CommConstant;
+import com.huiju.estateagents.entity.SysAdvancedConfigRelation;
 import com.huiju.estateagents.entity.SysButtonInMenu;
 import com.huiju.estateagents.entity.SysMenu;
+import com.huiju.estateagents.entity.TaAdvancedController;
 import com.huiju.estateagents.entity.TaRole;
 import com.huiju.estateagents.entity.TaRoleButton;
+import com.huiju.estateagents.mapper.SysAdvancedConfigRelationMapper;
+import com.huiju.estateagents.mapper.TaAdvancedControllerMapper;
 import com.huiju.estateagents.mapper.TaRoleButtonMapper;
 import com.huiju.estateagents.mapper.TaRoleMapper;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -20,6 +25,7 @@ import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.stream.Collectors;
 
 /**
  * @author admin
@@ -38,11 +44,33 @@ public class TaUserAuthButtonServiceImpl extends ServiceImpl<TaUserAuthButtonMap
     private TaUserMapper taUserMapper;
     @Autowired
     private TaRoleMapper taRoleMapper;
+    @Autowired
+    private TaAdvancedControllerMapper taAdvancedControllerMapper;
+    @Autowired
+    private SysAdvancedConfigRelationMapper sysAdvancedConfigRelationMapper;
 
     @Override
-    public ResponseBean getButtonByUserId(Integer pageNum, Integer pageSize, String userId) {
-        List<SysButtonInMenu> records = taUserAuthButtonMapper.sysButtonListByUserId(userId);
+    public ResponseBean getButtonByUserId(Integer pageNum, Integer pageSize, String userId, Integer orgId) {
+        List<SysButtonInMenu> records = new ArrayList<>();
+        List<SysButtonInMenu> menuList = taUserAuthButtonMapper.sysButtonListByUserId(userId);
+        records.addAll(menuList);
+        //添加高级配置的过滤条件
+        List<TaAdvancedController> taAdvancedControllerList = taAdvancedControllerMapper.selectList(new QueryWrapper<TaAdvancedController>().eq("org_id", orgId));
+
+        //需要过滤的菜单
+        QueryWrapper<SysAdvancedConfigRelation> sysAdvancedConfigRelationQueryWrapper = new QueryWrapper<>();
+        sysAdvancedConfigRelationQueryWrapper.eq("target_type", CommConstant.ADVANCED_TYPE_BUTTON);
+        sysAdvancedConfigRelationQueryWrapper.notIn(taAdvancedControllerList.size() > 0,"advanced_config_id",taAdvancedControllerList.stream().map(TaAdvancedController::getAdvancedConfigId).collect(Collectors.toList()));
+        List<SysAdvancedConfigRelation> sysAdvancedConfigRelations = sysAdvancedConfigRelationMapper.selectList(sysAdvancedConfigRelationQueryWrapper);
+        menuList.forEach(e -> {
+            sysAdvancedConfigRelations.forEach(s -> {
+                if ((e.getBtnId()).equals(Integer.valueOf(s.getTargetId()))){
+                    records.remove(e);
+                }
+            });
+        });
         return ResponseBean.success(records);
+
     }
 
     @Override

src/main/java/com/huiju/estateagents/common/CommConstant.java

@@ -740,6 +740,11 @@ public class CommConstant {
      */
     public static final Object ADVANCED_TYPE_MENU = "menu";
 
+    /**
+     * 菜单
+     */
+    public static final Object ADVANCED_TYPE_BUTTON = "button";
+
     /**
      * 线下缴费
      */

src/main/java/com/huiju/estateagents/redpack/entity/ConsumeOrder.java

@@ -28,7 +28,7 @@ public class ConsumeOrder {
      */
     @ColumnWidth(15)
     @ExcelProperty(value = "消费金额", index = 2)
-    private Integer amount;
+    private String amount;
 
     /**
      * 消费方式

src/main/java/com/huiju/estateagents/redpack/entity/RechargeOrder.java

@@ -28,7 +28,7 @@ public class RechargeOrder {
      */
     @ColumnWidth(15)
     @ExcelProperty(value = "充值金额", index = 2)
-    private Integer amount;
+    private String amount;
 
     /**
      * 充值方式

src/main/java/com/huiju/estateagents/redpack/entity/RefundOrder.java

@@ -28,7 +28,7 @@ public class RefundOrder {
      */
     @ColumnWidth(15)
     @ExcelProperty(value = "退款金额", index = 2)
-    private Integer amount;
+    private String amount;
 
     /**
      * 退款创建时间

src/main/java/com/huiju/estateagents/redpack/service/impl/TaOrgAccountServiceImpl.java

@@ -204,9 +204,11 @@ public class TaOrgAccountServiceImpl extends ServiceImpl<TaOrgAccountMapper, TaO
 
         //查询总充值金额
         Integer totalRechargeAmount = taOrgOrderMapper.countTotalRechargeAmount(orgId);
+        taOrgAccount.setTotalRechargeAmount(totalRechargeAmount);
 
         //查询退款冻结额
         Integer totalBlockAmount = taOrgAccountBlockedMapper.countTotalBlockAmount(orgId);
+        taOrgAccount.setRefundBlockedAmount(totalBlockAmount);
 
         //账户余额=总充值金额-已消费金额-已退款额-退款冻结额
         Integer balance = totalRechargeAmount - taOrgAccount.getPurchaseAmount() - taOrgAccount.getTotalRefund() - totalBlockAmount;

src/main/java/com/huiju/estateagents/redpack/service/impl/TaOrgOrderServiceImpl.java

@@ -12,6 +12,7 @@ import java.util.Arrays;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.stream.Collectors;
 
 import javax.servlet.http.HttpServletResponse;
 
@@ -115,11 +116,10 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
         IPage<TaOrgOrder> result = pg;
 
         if (CommConstant.ITEM_TYPE_RECHARGE.equals(orderType) || CommConstant.ITEM_TYPE_REFUND.equals(orderType)) {
+            List<String> urlList = new ArrayList<>();
             result = taOrgOrderMapper.orderListByRechargeOrRefund(pg, orderType, orgId, tradeNo, isOffline, tradingStatus, startDate, endDate, miniAppName);
             result.getRecords().forEach(e -> {
-                if (!StringUtils.isEmpty(e.getCertificateUrl())) {
-                    e.setCertificateUrlList(Arrays.asList(e.getCertificateUrl().split(",")));
-                }
+                e.setCertificateUrlList(getCertificateByOrderId(e.getOrderId()));
             });
             return result;
         } else if (CommConstant.ITEM_TYPE_REDPACKAGE.equals(orderType)) {
@@ -148,6 +148,14 @@ public class TaOrgOrderServiceImpl extends ServiceImpl<TaOrgOrderMapper, TaOrgOr
         return result;
     }
 
+    public List<String> getCertificateByOrderId(String orderId){
+        List<String> urlList = new ArrayList<>();
+        QueryWrapper<TaOrgAccountCertificate> taOrgAccountCertificateQueryWrapper = new QueryWrapper<>();
+        taOrgAccountCertificateQueryWrapper.eq("order_id", orderId);
+        List<TaOrgAccountCertificate> taOrgAccountCertificates = taOrgAccountCertificateMapper.selectList(taOrgAccountCertificateQueryWrapper);
+        urlList = taOrgAccountCertificates.stream().map(TaOrgAccountCertificate::getUrl).collect(Collectors.toList());
+        return urlList;
+    }
     /**
      * 微信支付
      *

src/main/java/com/huiju/estateagents/sample/controller/TaContactController.java

@@ -54,7 +54,7 @@ public class TaContactController extends BaseController {
     @RequestMapping(value = "/channel/listContactByCondition", method = RequestMethod.GET)
     public ResponseBean listContactByCondition(@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                                @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize,
-                                               String contactName, String telephone, String phone, String job, String listType) {
+                                               String contactName, String telephone, String phone, String job, String appellation) {
         ResponseBean responseBean = new ResponseBean();
         try {
             //使用分页插件
@@ -64,6 +64,7 @@ public class TaContactController extends BaseController {
             queryWrapper.like(!StringUtils.isEmpty(telephone), "telephone", telephone);
             queryWrapper.like(!StringUtils.isEmpty(phone), "phone", phone);
             queryWrapper.like(!StringUtils.isEmpty(job), "job", job);
+            queryWrapper.like(!StringUtils.isEmpty(appellation), "appellation", appellation);
             queryWrapper.eq("contact_type", CommConstant.FINANCE);
             queryWrapper.ne("status", CommConstant.STATUS_DELETE);
             queryWrapper.orderByDesc("order_no", "create_date");
@@ -132,6 +133,10 @@ public class TaContactController extends BaseController {
     public ResponseBean taContactUpdate(@PathVariable Integer id,
                                         @RequestBody TaContact taContact) {
         ResponseBean responseBean = new ResponseBean();
+        TaContact contact = iTaContactService.getById(id);
+        if (!StringUtils.isEmpty(contact.getContactType())){
+            taContact.setContactType(contact.getContactType());
+        }
         try {
             if (iTaContactService.updateById(taContact)) {
                 responseBean.addSuccess(taContact);
@@ -266,10 +271,14 @@ public class TaContactController extends BaseController {
     @RequestMapping(value = "/channel/taContactFinance/{id}", method = RequestMethod.PUT)
     public ResponseBean taContactInfoAdd(@PathVariable Integer id) {
         ResponseBean responseBean = new ResponseBean();
+        TaContact contact = iTaContactService.getById(id);
         try {
             TaContact taContact = new TaContact();
             taContact.setContactId(id);
             taContact.setContactType(CommConstant.FINANCE);
+            if (!StringUtils.isEmpty(contact.getOrderNo())){
+                taContact.setOrderNo(contact.getOrderNo());
+            }
             if (iTaContactService.updateById(taContact)) {
                 responseBean.addSuccess(taContact);
             } else {

src/main/java/com/huiju/estateagents/sample/controller/TaH5SampleController.java

@@ -362,6 +362,8 @@ public class TaH5SampleController extends BaseController {
             taH5Sample.setUpdateDate(LocalDateTime.now());
             if (CollectionUtils.isNotEmpty(taH5Sample.getTaH5Template())){
                 taH5Sample.setH5TemplateId(taH5Sample.getTaH5Template().get(0).getH5TemplateId());
+            }else{
+                taH5Sample.setH5TemplateId("");
             }
             if (iTaH5SampleService.updateById(taH5Sample)) {
                 List<TaContact> taContactList = taH5Sample.getTaContactList();

src/main/java/com/huiju/estateagents/sample/entity/TaH5Sample.java

@@ -141,6 +141,7 @@ public class TaH5Sample implements Serializable {
     /**
      *  模板ID
      */
+    @TableField(strategy = FieldStrategy.IGNORED)
     private String h5TemplateId;
 
     @TableField(exist = false)

src/main/resources/mapper/redpack/TaOrgOrderMapper.xml

@@ -49,7 +49,7 @@
         <if test="miniAppName != null and miniAppName != ''">
             and b.name like concat('%', #{miniAppName}, '%')
         </if>
-        group by t.order_id
+        group by t.order_id order by t.create_date desc
     </select>
 
     <select id="orderListByConsume" resultType="com.huiju.estateagents.redpack.entity.TaOrgOrder">
@@ -97,17 +97,17 @@
         <if test="miniAppName != null and miniAppName != ''">
             and b.name like concat('%', #{miniAppName}, '%')
         </if>
-        GROUP BY t.order_id
+        GROUP BY t.order_id order by t.create_date desc
     </select>
 
     <select id="orderListByRechargeOrRefundExport" resultType="com.huiju.estateagents.redpack.entity.RechargeOrder">
         select
         t.trade_no as tradeNo,
-        t.amount as amount,
+        FORMAT(t.amount/100, 2) as amount,
         b.name as miniAppName,
         if(t.is_offline = 1, '业务线上充值', '运营手工充值') as isOffline,
         t.create_date as createDate,
-        if(t.trading_status = 'processing', '进行中', if(t.trading_status = 'success', '已支付','已超时')) as tradingStatus,
+        if(t.trading_status = 'processing', '待支付', if(t.trading_status = 'success', '已支付','已超时')) as tradingStatus,
         t.pay_date as payDate
         From ta_org_order t
         left join ta_org_order_detail a on t.order_id = a.order_id
@@ -132,14 +132,14 @@
         <if test="miniAppName != null and miniAppName != ''">
             and b.name like concat('%', #{miniAppName}, '%')
         </if>
-        GROUP BY t.order_id
+        GROUP BY t.order_id order by t.create_date desc
     </select>
 
     <select id="orderListByConsumeExport" resultType="com.huiju.estateagents.redpack.entity.ConsumeOrder">
         select
         t.trade_no as tradeNo,
         b.name as miniAppName,
-        t.amount as amount,
+        FORMAT(t.amount/100, 2) as amount,
         t.create_date as createDate,
         c.phone as phone,
         if(t.trading_status = 'success', '成功','失败') as tradingStatus,
@@ -170,7 +170,7 @@
         <if test="miniAppName != null and miniAppName != ''">
             and b.name like concat('%', #{miniAppName}, '%')
         </if>
-        GROUP BY t.order_id
+        GROUP BY t.order_id order by t.create_date desc
     </select>
 
     <select id="listCzOrderByCondition" resultType="com.huiju.estateagents.redpack.entity.TaOrgOrder">
@@ -320,7 +320,7 @@
     <select id="countTotalRechargeAmount" resultType="java.lang.Integer">
         select ifnull(sum(t.amount),0) as amount from ta_org_order t
         left join ta_org_order_detail a on t.order_id = a.order_id where t.org_id = #{orgId}
-        and a.item_type = 'recharge'
+        and a.item_type = 'recharge' and t.trading_status = 'success'
     </select>
 
     <select id="listRedPacketRecords" resultType="com.huiju.estateagents.redpack.entity.TaOrgOrder">
@@ -467,7 +467,7 @@
     <select id="orderListByRefundExport" resultType="com.huiju.estateagents.redpack.entity.RefundOrder">
         select
         t.trade_no as tradeNo,
-        t.amount as amount,
+        FORMAT(t.amount/100, 2) as amount,
         b.name as miniAppName,
         t.create_date as createDate,
         d.audit_result as auditResult,
@@ -491,7 +491,7 @@
         <if test="miniAppName != null and miniAppName != ''">
             and b.name like concat('%', #{miniAppName}, '%')
         </if>
-        GROUP BY t.order_id
+        GROUP BY t.order_id order by t.create_date desc
     </select>
 
     <select id = "getRedPacketSendInfo" resultType="map">