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

# Conflicts:
#	src/main/java/com.huiju.welcome/controller/TaCustomerTransferController.java

src/main/java/com.huiju.welcome/controller/AudioController.java

 package com.huiju.welcome.controller;
 
 import com.huiju.welcome.common.base.ResponseBean;
+import com.huiju.welcome.utils.SAWeather;
+import com.huiju.welcome.utils.StringUtils;
 import com.huiju.welcome.utils.XFYun;
 import io.swagger.annotations.ApiImplicitParam;
 import io.swagger.annotations.ApiImplicitParams;
 public class AudioController {
     @Autowired
     private XFYun xfYun;
+    
+    @Autowired
+    private SAWeather saWeather;
 
     @ApiOperation(value = "音频获取", notes = "音频获取")
     @ApiImplicitParams({
         responseBean.addSuccess(audio);
         return responseBean;
     }
+    
+    @RequestMapping(value = "/screen/weather", method = RequestMethod.GET)
+    public ResponseBean getWeather(@RequestParam String city) {
+        ResponseBean responseBean = new ResponseBean();
+        if (StringUtils.isEmpty(city)) {
+            city = "南京";
+        }
+        responseBean.addSuccess(saWeather.weather(city));
+        return responseBean;
+    }
 }

src/main/java/com.huiju.welcome/controller/TaMainUsherRecordController.java

 package com.huiju.welcome.controller;
 
+import com.alibaba.fastjson.JSONArray;
 import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
 import com.huiju.welcome.model.TaMainUsherRecord;
 import com.huiju.welcome.service.*;
 import com.huiju.welcome.utils.DateUtils;
+import com.huiju.welcome.utils.JWTUtils;
 import com.huiju.welcome.utils.StatusUtils;
 import com.huiju.welcome.utils.StringUtils;
 import org.apache.http.HttpStatus;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
+import javax.servlet.http.HttpServletRequest;
 import java.util.List;
 
 /**
         ResponseBean result = iTaMainUsherRecordService.customerPage(pageNum, pageSize,customerName,phone,platNumber, agentUserId);
         return result;
     }
+    
+    /**
+     * 修改对象
+     * @return
+     */
+    @RequestMapping(value="/miniapp/mainUsherRecord/follow/{customerId}",method= RequestMethod.POST)
+    public ResponseBean update(@RequestBody TaMainUsherRecord taMainUsherRecord, @PathVariable Integer customerId, HttpServletRequest request){
+        ResponseBean responseBean = new ResponseBean();
+        try {
+            iTaMainUsherRecordService.updateMainUsherRecord(taMainUsherRecord,customerId, JWTUtils.getSubject(request));
+        }catch (Exception e){
+            logger.error("taMainUsherRecordUpdate -=- {}",e.toString());
+            responseBean.addError(e.getMessage());
+        }
+        return responseBean;
+    }
 }

src/main/java/com.huiju.welcome/service/ITaMainUsherRecordService.java

     boolean updateByCustomer(TaCustomer taCustomer, JSONArray follows, String userId);
 
     TaMainUsherRecord getTodayRecord(Integer customerId);
+    
+    boolean updateMainUsherRecord(TaMainUsherRecord taMainUsherRecord, Integer customerId, String subject);
 }

src/main/java/com.huiju.welcome/service/impl/TaGoodsOrdersServiceImpl.java

         for (int j = 0;j<orders.size();j++){
             List<TaGoodsOrdersDetail>thisDetail = new ArrayList<>();
             for(int h = 0; h<detailList.size();h++){
-                if(orders.get(j).getOrdersId() == detailList.get(h).getOrdersId()){
+                if(orders.get(j).getOrdersId().equals(detailList.get(h).getOrdersId())){
                     thisDetail.add(detailList.get(h));
                 }
             }

src/main/java/com.huiju.welcome/service/impl/TaGoodsServiceImpl.java

 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.huiju.welcome.common.base.ResponseBean;
 import com.huiju.welcome.mapper.TaGoodsMapper;
+import com.huiju.welcome.mapper.TaGoodsSpecMapper;
 import com.huiju.welcome.model.TaGoods;
+import com.huiju.welcome.model.TaGoodsSpec;
 import com.huiju.welcome.service.ITaGoodsService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
+import java.util.List;
+
 /**
  * <p>
  *  服务实现类
 
     @Autowired
     private TaGoodsMapper taGoodsMapper;
+    @Autowired
+    private TaGoodsSpecMapper taGoodsSpecMapper;
 
     @Override
     public ResponseBean goodsList(IPage<TaGoods> pg, String goodsName, Integer typeId) {
         ResponseBean responseBean= new ResponseBean();
         IPage<TaGoods> list= taGoodsMapper.goodsList(pg,goodsName,typeId);
+        List<TaGoods> goodsList = list.getRecords();
+        List<Integer>idList = new ArrayList<>();
+        for(int i=0;i<goodsList.size();i++){
+            idList.add(goodsList.get(i).getGoodsId());
+        }
+        List<TaGoodsSpec> specList = new ArrayList<>();
+        specList = taGoodsSpecMapper.selectBatchIds(idList);
+        for(int j =0;j<goodsList.size();j++){
+            List<TaGoodsSpec> thisSpec = new ArrayList<>();
+            for (int h = 0;h<specList.size();h++){
+                if (goodsList.get(j).getGoodsId().equals(specList.get(h).getGoodsId())){
+                    thisSpec.add(specList.get(h));
+                }
+            }
+            goodsList.get(j).setSpecList(thisSpec);
+        }
+
         responseBean.addSuccess(list);
         return responseBean;
     }

src/main/java/com.huiju.welcome/service/impl/TaMainUsherRecordServiceImpl.java

 
         return taMainUsherRecordMapper.selectOne(queryWrapper);
     }
-
+    
+    @Override
+    public boolean updateMainUsherRecord(TaMainUsherRecord taMainUsherRecord, Integer customerId, String userId) {
+	    List<TaFollowupRecord> taFollowupRecordList = taMainUsherRecord.getFollows();
+	    TaCustomer taCustomer = taCustomerMapper.selectById(customerId);
+        if (null == taMainUsherRecord.getRecId()) {
+            Integer personId = taWechatUserMapper.selectById(userId).getPersonId();
+            taMainUsherRecord = newRecordByCust(taCustomer, sysUserMapper.selectById(personId));
+        
+            int row = taMainUsherRecordMapper.insert(taMainUsherRecord);
+            if (row < 1) {
+                log.error("新增跟进记录失败");
+                return false;
+            }
+        } else {
+            String remark = taMainUsherRecord.getRemark();
+        
+            if (null == remark) {
+                remark = taCustomer.getRemark();
+            }
+            //else if (!StringUtils.isEmpty(taCustomer.getRemark())) {
+            //    remark += "\n\n---" + DateUtils.cutSecond(LocalDateTime.now())+ "---" + "\n" + taCustomer.getRemark();
+            //}
+            taMainUsherRecord.setRemark(remark);
+        
+            int row = taMainUsherRecordMapper.updateById(taMainUsherRecord);
+            if (row < 1) {
+                log.error("更新跟进记录失败");
+                return false;
+            }
+            //删除随访人员头像
+	        QueryWrapper<TaFollowupRecord> queryWrapper = new QueryWrapper<>();
+	        queryWrapper.eq("rec_id",taMainUsherRecord.getRecId());
+	        taFollowupRecordMapper.delete(queryWrapper);
+        }
+	    for (TaFollowupRecord follow : taFollowupRecordList) {
+		    follow.setRecId(taMainUsherRecord.getRecId());
+		    taFollowupRecordMapper.insert(follow);
+	    }
+    
+        return true;
+    }
+    
     private TaMainUsherRecord newRecordByPerson(TaPerson taPerson) {
         TaMainUsherRecord taMainUsherRecord = new TaMainUsherRecord();
         taMainUsherRecord.setPersonName(taPerson.getName());